diff options
| author | Tim E. Real <termtech@rogers.com> | 2010-11-15 00:18:50 +0000 |
|---|---|---|
| committer | Tim E. Real <termtech@rogers.com> | 2010-11-15 00:18:50 +0000 |
| commit | 8a34d4bbb06a25200be52aaaed5db47784606cfc (patch) | |
| tree | e513ab1f7a69bab818a6cfbe3902b90c52386082 /muse2 | |
| parent | 8c3d365acbc4ea40beb2cf980591fe146c996ce3 (diff) | |
Fixed crash in MusE::closeEvent() upon 'abort'.
Diffstat (limited to 'muse2')
| -rw-r--r-- | muse2/ChangeLog | 4 | ||||
| -rw-r--r-- | muse2/muse/app.cpp | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/muse2/ChangeLog b/muse2/ChangeLog index 2f1e2f57..e856c5a8 100644 --- a/muse2/ChangeLog +++ b/muse2/ChangeLog @@ -1,7 +1,9 @@ 14.11.2010 - renamed deicsonze2 files and classes with '2' suffixes - Applied patch by Orcan to convert populateAddSynth(). (Tim) - - Changed all setMargin() calls to setContentsMargins(). (setMargin() is obsoleted!) + - Changed all setMargin() calls to setContentsMargins(). (setMargin() is obsoleted!) (Tim) + - Fixed crash in MusE::closeEvent() upon close: save, skip, abort? = abort. (Tim) + TODO: Some other suspicious looking closeEvent()s. May need to fix... 12.11.2010 - Fixed arranger alignment issues - set layout margins to zero. (Tim) TODO: Track list items aligned to canvas tracks are still off by one lousy vertical pixel. 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(); |