[meld/meld-3-18] filediff: Fix overly eager tab close handling for cancelled closes



commit 22ee474472a2d9c3d3f392bc9bf85e43a6c0bcd4
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Nov 19 10:41:26 2017 +1000

    filediff: Fix overly eager tab close handling for cancelled closes

 meld/filediff.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index ad2de9fb..3e75083e 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -837,14 +837,14 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
         return response
 
     def on_delete_event(self):
-        # TODO: This should not be necessary; remove if and when we
-        # figure out what's keeping MeldDocs alive for too long.
-        del self._cached_match
         self.state = melddoc.STATE_CLOSING
         response = self.check_save_modified()
         if response == Gtk.ResponseType.OK:
             for h in self.settings_handlers:
                 meldsettings.disconnect(h)
+            # TODO: This should not be necessary; remove if and when we
+            # figure out what's keeping MeldDocs alive for too long.
+            del self._cached_match
             # TODO: Base the return code on something meaningful for VC tools
             self.emit('close', 0)
         return response


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]