fixed #202: "Cancel" button of editor close confirmation dialog is broken

gdementen · gdementen · commit c27e586544f3 · 2019-12-16T14:53:35.000+01:00
It was actually equivalent to the "discard" button, possibly leading to data loss.
This was a regression in 0.32.
diff --git a/doc/source/changes/version_0_32_1.rst.inc b/doc/source/changes/version_0_32_1.rst.inc
@@ -3,5 +3,8 @@
 Fixes
 ^^^^^
 
+* fixed the "Cancel" button of the confirmation dialog when trying to quit the editor with unsaved modifications.
+  It was equivalent to discard, potentially leading to data loss.
+
 * fixed (harmless) error messages appearing when trying to display any variable via the console when using
   matplotlib 3.1+
diff --git a/larray_editor/editor.py b/larray_editor/editor.py
@@ -773,13 +773,14 @@ def _ask_to_save_if_unsaved_modifications(self):
             return True
 
     def closeEvent(self, event):
+        # as per the example in the Qt doc (https://doc.qt.io/qt-5/qwidget.html#closeEvent), we should *NOT* call
+        # the closeEvent() method of the superclass in this case because all it does is "event.accept()"
+        # unconditionally which results in the application being closed regardless of what the user chooses (see #202).
         if self._ask_to_save_if_unsaved_modifications():
+            self.save_widgets_state_and_geometry()
             event.accept()
         else:
             event.ignore()
-        self.save_widgets_state_and_geometry()
-        AbstractEditor.closeEvent(self, event)
-
 
     #########################################
     #               FILE MENU               #
