From a65e69cb539db5334e5de6897793b03d7d24be94 Mon Sep 17 00:00:00 2001
From: Nick Hall <nick-h@gramps-project.org>
Date: Wed, 30 Dec 2015 00:41:00 +0000
Subject: [PATCH] Only check for changed data when cancel button clicked

---
 gramps/gui/editors/editcitation.py   | 2 +-
 gramps/gui/editors/editevent.py      | 2 +-
 gramps/gui/editors/editmedia.py      | 2 +-
 gramps/gui/editors/editnote.py       | 2 +-
 gramps/gui/editors/editplace.py      | 2 +-
 gramps/gui/editors/editrepository.py | 2 +-
 gramps/gui/editors/editsource.py     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/gramps/gui/editors/editcitation.py b/gramps/gui/editors/editcitation.py
index 52c7c190a..20bbf98dc 100644
--- a/gramps/gui/editors/editcitation.py
+++ b/gramps/gui/editors/editcitation.py
@@ -323,7 +323,7 @@ class EditCitation(EditPrimary):
 
         if self.callback:
             self.callback(self.obj.get_handle())
-        self.close()
+        self._do_close()
 
     def data_has_changed(self):
         """
diff --git a/gramps/gui/editors/editevent.py b/gramps/gui/editors/editevent.py
index 0729428c8..8daeb240b 100644
--- a/gramps/gui/editors/editevent.py
+++ b/gramps/gui/editors/editevent.py
@@ -279,7 +279,7 @@ class EditEvent(EditPrimary):
 
         if self.callback:
             self.callback(self.obj)
-        self.close()
+        self._do_close()
 
     def data_has_changed(self):
         """
diff --git a/gramps/gui/editors/editmedia.py b/gramps/gui/editors/editmedia.py
index 67b13df9f..3a81e1bea 100644
--- a/gramps/gui/editors/editmedia.py
+++ b/gramps/gui/editors/editmedia.py
@@ -334,7 +334,7 @@ class EditMedia(EditPrimary):
 
         if self.callback:
             self.callback(self.obj)
-        self.close()
+        self._do_close()
 
     def data_has_changed(self):
         """
diff --git a/gramps/gui/editors/editnote.py b/gramps/gui/editors/editnote.py
index 57ae8c0ad..f5c0369da 100644
--- a/gramps/gui/editors/editnote.py
+++ b/gramps/gui/editors/editnote.py
@@ -341,7 +341,7 @@ class EditNote(EditPrimary):
 
         if self.callback:
             self.callback(self.obj.get_handle())
-        self.close()
+        self._do_close()
 
 class DeleteNoteQuery(object):
     def __init__(self, dbstate, uistate, note, the_lists):
diff --git a/gramps/gui/editors/editplace.py b/gramps/gui/editors/editplace.py
index 9e7e7786c..189c88c69 100644
--- a/gramps/gui/editors/editplace.py
+++ b/gramps/gui/editors/editplace.py
@@ -315,7 +315,7 @@ class EditPlace(EditPrimary):
                 msg = _("Edit Place (%s)") % place_title
             trans.set_description(msg)
 
-        self.close()
+        self._do_close()
         if self.callback:
             self.callback(self.obj)
 
diff --git a/gramps/gui/editors/editrepository.py b/gramps/gui/editors/editrepository.py
index 49f49d9ba..d4efb2c30 100644
--- a/gramps/gui/editors/editrepository.py
+++ b/gramps/gui/editors/editrepository.py
@@ -207,7 +207,7 @@ class EditRepository(EditPrimary):
                 msg = _("Edit Repository (%s)") % self.obj.get_name()
             trans.set_description(msg)
 
-        self.close()
+        self._do_close()
 
 class DeleteRepositoryQuery(object):
     def __init__(self, dbstate, uistate, repository, sources):
diff --git a/gramps/gui/editors/editsource.py b/gramps/gui/editors/editsource.py
index a238cf3ec..b1934121b 100644
--- a/gramps/gui/editors/editsource.py
+++ b/gramps/gui/editors/editsource.py
@@ -227,7 +227,7 @@ class EditSource(EditPrimary):
                 msg = _("Edit Source (%s)") % self.obj.get_title()
             trans.set_description(msg)
 
-        self.close()
+        self._do_close()
         if self.callback:
             self.callback(self.obj)