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

Fix crash for multiple deletes in one transaction (#814)

Browse Source 
Fixes #11117
This commit is contained in:
Paul Culley
2019-06-09 20:39:54 -05:00
committed by Sam Manzi
parent 87955ed2e9
commit 7ca19214d6
2 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
gramps/gui/displaystate.py
View File

@@ -116,30 +116,6 @@ class History(Callback):
if initial_person: if initial_person:
self.push(initial_person.get_handle()) self.push(initial_person.get_handle())
def remove(self, handle, old_id=None):
"""
Remove a handle from the history list
"""
if old_id:
del_id = old_id
else:
del_id = handle
history_count = self.history.count(del_id)
for c in range(history_count):
self.history.remove(del_id)
self.index -= 1
mhc = self.mru.count(del_id)
for c in range(mhc):
self.mru.remove(del_id)
self.emit('mru-changed', (self.mru, ))
if self.history:
newact = self.history[self.index]
if not isinstance(newact, str):
newact = str(newact)
self.emit('active-changed', (newact,))
def push(self, handle): def push(self, handle):
""" """
Pushes the handle on the history stack Pushes the handle on the history stack
@@ -229,8 +205,21 @@ class History(Callback):
Called in response to an object-delete signal. Called in response to an object-delete signal.
Removes a list of handles from the history. Removes a list of handles from the history.
""" """
for handle in handle_list: for del_id in handle_list:
self.remove(handle) history_count = self.history.count(del_id)
for dummy in range(history_count):
self.history.remove(del_id)
self.index -= 1
mhc = self.mru.count(del_id)
for dummy in range(mhc):
self.mru.remove(del_id)
if self.history:
newact = self.history[self.index]
if not isinstance(newact, str):
newact = str(newact)
self.emit('active-changed', (newact,))
self.emit('mru-changed', (self.mru, ))
def history_changed(self): def history_changed(self):
""" """

16
gramps/gui/views/listview.py
View File

@@ -792,9 +792,19 @@ class ListView(NavigationView):
if self.active or \ if self.active or \
(not self.dirty and not self._dirty_on_change_inactive): (not self.dirty and not self._dirty_on_change_inactive):
cput = time.clock() cput = time.clock()
list(map(self.model.delete_row_by_handle, handle_list)) for hndl in handle_list:
LOG.debug(' ' + self.__class__.__name__ + ' row_delete ' + if hndl != handle_list[-1]:
str(time.clock() - cput) + ' sec') # For multiple deletes, row updates can result in a
# selection changed signal to a handle already
# deleted. In these cases we don't want to change the
# active to non-existant handles.
self.model.dont_change_active = True
else:
# Allow active changed on last item deleted
self.model.dont_change_active = False
self.model.delete_row_by_handle(hndl)
LOG.debug(' ' + self.__class__.__name__ + ' row_delete ' +
str(time.clock() - cput) + ' sec')
if self.active: if self.active:
self.uistate.show_filter_results(self.dbstate, self.uistate.show_filter_results(self.dbstate,
self.model.displayed(), self.model.displayed(),