summaryrefslogtreecommitdiff
path: root/muse2/muse
diff options
context:
space:
mode:
authorTim E. Real <termtech@rogers.com>2010-11-15 00:18:50 +0000
committerTim E. Real <termtech@rogers.com>2010-11-15 00:18:50 +0000
commit8a34d4bbb06a25200be52aaaed5db47784606cfc (patch)
treee513ab1f7a69bab818a6cfbe3902b90c52386082 /muse2/muse
parent8c3d365acbc4ea40beb2cf980591fe146c996ce3 (diff)
Fixed crash in MusE::closeEvent() upon 'abort'.
Diffstat (limited to 'muse2/muse')
-rw-r--r--muse2/muse/app.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/muse2/muse/app.cpp b/muse2/muse/app.cpp
index b1130fba..28c5e545 100644
--- a/muse2/muse/app.cpp
+++ b/muse2/muse/app.cpp
@@ -1873,7 +1873,7 @@ void MusE::quitDoc()
// closeEvent
//---------------------------------------------------------
-void MusE::closeEvent(QCloseEvent*)
+void MusE::closeEvent(QCloseEvent* event)
{
song->setStop(true);
//
@@ -1890,10 +1890,16 @@ void MusE::closeEvent(QCloseEvent*)
tr("&Save"), tr("&Skip"), tr("&Abort"), 0, 2);
if (n == 0) {
if (!save()) // dont quit if save failed
+ {
+ event->ignore();
return;
+ }
}
else if (n == 2)
+ {
+ event->ignore();
return;
+ }
}
seqStop();