diff --git a/ChangeLog b/ChangeLog index ebd901f27..55fff4f4c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,8 @@ 2007-06-22 Alex Roitman - * src/GrampsDb/_GrampsGEDDB.py (close): Save after batch transactions. - * src/GrampsDb/_GrampsXMLDB.py (close): Save after batch transactions. + * src/GrampsDb/_GrampsGEDDB.py (close): Save after batch + transactions: #862. + * src/GrampsDb/_GrampsXMLDB.py (close): Save after batch + transactions: #862. 2007-06-22 Brian Matherly * src/ReportBase/_ReportDialog.py: Still let REAL exceptions pass through. diff --git a/src/GrampsDb/_GrampsGEDDB.py b/src/GrampsDb/_GrampsGEDDB.py index d0b86cca6..16b773e0f 100644 --- a/src/GrampsDb/_GrampsGEDDB.py +++ b/src/GrampsDb/_GrampsGEDDB.py @@ -53,6 +53,7 @@ class GrampsGEDDB(GrampsInMemDB): self.bookmarks = GrampsDbBookmarks(self.metadata.get('bookmarks',[])) self.db_is_open = True + self.abort_possible = True return 1 def load_from(self, other_database, filename, callback): diff --git a/src/GrampsDb/_GrampsXMLDB.py b/src/GrampsDb/_GrampsXMLDB.py index c97f06f31..8681084d5 100644 --- a/src/GrampsDb/_GrampsXMLDB.py +++ b/src/GrampsDb/_GrampsXMLDB.py @@ -60,6 +60,7 @@ class GrampsXMLDB(GrampsInMemDB): self.bookmarks.set(self.metadata.get('bookmarks',[])) self.db_is_open = True + self.abort_possible = True return 1 def load_from(self, other_database, filename, callback): @@ -76,6 +77,7 @@ class GrampsXMLDB(GrampsInMemDB): return if (not self.readonly) and ((len(self.undodb)>0) or not self.abort_possible): + print self.abort_possible, len(self.undodb) quick_write(self,self.full_name) self.db_is_open = False GrampsInMemDB.close(self)