From 8ceccb4a28bd0e31986092575aa40b30f8f27f06 Mon Sep 17 00:00:00 2001
From: prculley <paulr2787@gmail.com>
Date: Mon, 26 Jul 2021 11:35:10 -0500
Subject: [PATCH] Fix error when trying to close name editor during long name
 group mapping view rebuild.

Fixes #12328
---
 gramps/gui/editors/editname.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/gramps/gui/editors/editname.py b/gramps/gui/editors/editname.py
index 3d83058e1..1de7399e8 100644
--- a/gramps/gui/editors/editname.py
+++ b/gramps/gui/editors/editname.py
@@ -366,6 +366,7 @@ class EditName(EditSecondary):
             5/     local set, not global set --> set (change local)
             6/     local set,     global set --> set (set to global if possible)
         """
+        ngm = False  # name group mapping setting
         closeit = True
         surname = self.obj.get_primary_surname().get_surname()
         group_as= self.obj.get_group_as()
@@ -388,7 +389,7 @@ class EditName(EditSecondary):
                 val = q.run()
                 if val:
                     #delete the grouping link on database
-                    self.db.set_name_group_mapping(surname, None)
+                    ngm = None  # delay setting until dialog closes
                     self.obj.set_group_as("")
                 else :
                     closeit = False
@@ -421,9 +422,9 @@ class EditName(EditSecondary):
                     val = q.run()
                     if val:
                         if group_as == surname :
-                            self.db.set_name_group_mapping(surname, None)
+                            ngm = None  # delay setting until dialog closes
                         else:
-                            self.db.set_name_group_mapping(surname, group_as)
+                            ngm = group_as  # delay setting until dialog closes
                         self.obj.set_group_as("")
                     else:
                         if self.global_group_set :
@@ -455,10 +456,15 @@ class EditName(EditSecondary):
                     pass
 
         if closeit:
+            db = self.db  # close cleanup loses self.db, so save for later
             if self.callback:
                 self.callback(self.obj)
             self.callback = None
             self.close()
+            # bug 12328 to avoid gui interaction during view rebuild, delay
+            # the rebuild until closeing this dialog
+            if ngm is not False:
+                db.set_name_group_mapping(surname, ngm)
 
     def _cleanup_on_exit(self):
         """