Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/gramps_main.py: check for reentrancy into the undo handler

Browse Source 
svn: r4359
This commit is contained in:
Don Allingham 2005-04-13 22:04:52 +00:00
parent 61a5f5e168
commit 838ceb67bb
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,4 +1,5 @@
2005-04-13 Don Allingham <don@gramps-project.org> 2005-04-13 Don Allingham <don@gramps-project.org>
* src/gramps_main.py: check for reentrancy into the undo handler
* src/plugins/WebPage.py: fixed check on dialog run() return value, * src/plugins/WebPage.py: fixed check on dialog run() return value,
changed deprecated gtk.mainiteration to gtk.main_iteration changed deprecated gtk.mainiteration to gtk.main_iteration
* src/WriteGedcom.py: fixed problem with skipping events * src/WriteGedcom.py: fixed problem with skipping events

11
src/gramps_main.py
View File

@ -139,6 +139,8 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
self.mhistory = [] self.mhistory = []
self.hindex = -1 self.hindex = -1
self.undo_active = False
self.db = GrampsBSDDB.GrampsBSDDB() self.db = GrampsBSDDB.GrampsBSDDB()
try: try:
@ -501,11 +503,20 @@ class Gramps(GrampsDBCallback.GrampsDBCallback):
label.set_use_underline(1) label.set_use_underline(1)
def undo(self,*args): def undo(self,*args):
"""
Undo signal handler - it is possible to reenter this routine too quickly if
the user presses the C-z signal too quickly. So, we need to check to make sure
we aren't already active.
"""
if self.undo_active:
return
self.undo_active = True
self.db.undo() self.db.undo()
if self.active_person: if self.active_person:
p = self.db.get_person_from_handle(self.active_person.get_handle()) p = self.db.get_person_from_handle(self.active_person.get_handle())
self.change_active_person(p) self.change_active_person(p)
self.emit('database-changed',(self.db,)) self.emit('database-changed',(self.db,))
self.undo_active = False
def exit_and_undo(self,*args): def exit_and_undo(self,*args):
self.db.disable_signals() self.db.disable_signals()