From 7ca19214d6788c79634488f3acff91dfe6c0ca33 Mon Sep 17 00:00:00 2001
From: Paul Culley <paulr2787@gmail.com>
Date: Sun, 9 Jun 2019 20:39:54 -0500
Subject: [PATCH] Fix crash for multiple deletes in one transaction (#814)

Fixes #11117
---
 gramps/gui/displaystate.py   | 41 +++++++++++++-----------------------
 gramps/gui/views/listview.py | 16 +++++++++++---
 2 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/gramps/gui/displaystate.py b/gramps/gui/displaystate.py
index f3ca7b516..823d2a75b 100644
--- a/gramps/gui/displaystate.py
+++ b/gramps/gui/displaystate.py
@@ -116,30 +116,6 @@ class History(Callback):
             if initial_person:
                 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):
         """
         Pushes the handle on the history stack
@@ -229,8 +205,21 @@ class History(Callback):
         Called in response to an object-delete signal.
         Removes a list of handles from the history.
         """
-        for handle in handle_list:
-            self.remove(handle)
+        for del_id in handle_list:
+            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):
         """
diff --git a/gramps/gui/views/listview.py b/gramps/gui/views/listview.py
index 7a4d0241a..21740883d 100644
--- a/gramps/gui/views/listview.py
+++ b/gramps/gui/views/listview.py
@@ -792,9 +792,19 @@ class ListView(NavigationView):
         if self.active or \
            (not self.dirty and not self._dirty_on_change_inactive):
             cput = time.clock()
-            list(map(self.model.delete_row_by_handle, handle_list))
-            LOG.debug('   '  + self.__class__.__name__ + ' row_delete ' +
-                    str(time.clock() - cput) + ' sec')
+            for hndl in handle_list:
+                if hndl != handle_list[-1]:
+                    # 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:
                 self.uistate.show_filter_results(self.dbstate,
                                                  self.model.displayed(),