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

fix Undo; crashes due to race in Gtk

Browse Source 
Some Redraws occur during a model clear when the row changed signal
is emmitted.  Model is only partially cleared at that point.
Under some conditions, some more of the model gets
cleared before the redraw completes, and redraw fails.
fixes #9932
This commit is contained in:
prculley 2017-02-20 11:32:22 -06:00 committed by Nick Hall
parent 86e2d96228
commit 2eb1f31d92
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gramps/gui/undohistory.py
View File

@ -120,10 +120,11 @@ class UndoHistory(ManagedWindow):
scrolled_window.add(self.tree) scrolled_window.add(self.tree)
self.window.vbox.pack_start(scrolled_window, True, True, 0) self.window.vbox.pack_start(scrolled_window, True, True, 0)
self.sel_chng_hndlr = self.selection.connect('changed',
self._selection_changed)
self._build_model() self._build_model()
self._update_ui() self._update_ui()
self.selection.connect('changed', self._selection_changed)
self.show() self.show()
def _selection_changed(self, obj): def _selection_changed(self, obj):
@ -226,6 +227,7 @@ class UndoHistory(ManagedWindow):
) )
def _build_model(self): def _build_model(self):
self.selection.handler_block(self.sel_chng_hndlr)
self.model.clear() self.model.clear()
fg = bg = None fg = bg = None
@ -243,6 +245,7 @@ class UndoHistory(ManagedWindow):
mod_text = txn.get_description() mod_text = txn.get_description()
self.model.append(row=[time_text, mod_text, fg, bg]) self.model.append(row=[time_text, mod_text, fg, bg])
path = (self.undodb.undo_count,) path = (self.undodb.undo_count,)
self.selection.handler_unblock(self.sel_chng_hndlr)
self.selection.select_path(path) self.selection.select_path(path)
def update(self): def update(self):