[haiku-commits] haiku: hrev46628 - src/apps/icon-o-matic
- From: superstippi@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 31 Dec 2013 10:32:02 +0100 (CET)
hrev46628 adds 1 changeset to branch 'master'
old head: 852730f03640639353186f256e481f080857f75f
new head: f31a2f68cc708c0bca626ae6acb2cdd0086fc241
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=f31a2f6+%5E852730f
----------------------------------------------------------------------------
f31a2f6: Icon-O-Matic: Forget fMessageAfterSave when FilePanel was cancelled.
fMessageAfterSave capture what was to be done after a file panel was
used. For example, picking up quitting the app after the user saved
unsaved changes. The bug was that when trying to quit IOM, deciding to
save, but then cancelling the file panel, the quitting stopped (as expected).
But then the next time the document was saved, IOM quit unexpectedly.
[ Stephan Aßmus <superstippi@xxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev46628
Commit: f31a2f68cc708c0bca626ae6acb2cdd0086fc241
URL: http://cgit.haiku-os.org/haiku/commit/?id=f31a2f6
Author: Stephan Aßmus <superstippi@xxxxxx>
Date: Tue Dec 31 09:28:47 2013 UTC
----------------------------------------------------------------------------
1 file changed, 6 insertions(+)
src/apps/icon-o-matic/MainWindow.cpp | 6 ++++++
----------------------------------------------------------------------------
diff --git a/src/apps/icon-o-matic/MainWindow.cpp
b/src/apps/icon-o-matic/MainWindow.cpp
index ee5a4ce..244dc0c 100644
--- a/src/apps/icon-o-matic/MainWindow.cpp
+++ b/src/apps/icon-o-matic/MainWindow.cpp
@@ -344,6 +344,12 @@ MainWindow::MessageReceived(BMessage* message)
}
break;
}
+ case B_CANCEL:
+ // FilePanel was canceled, do not execute the
fMessageAfterSave
+ // next time a file panel is used, in case it was set!
+ delete fMessageAfterSave;
+ fMessageAfterSave = NULL;
+ break;
case MSG_UNDO:
fDocument->CommandStack()->Undo();
Other related posts:
- » [haiku-commits] haiku: hrev46628 - src/apps/icon-o-matic - superstippi
