From f92903b1f7c9e75d0a4dc2ecb40f2bf3a3fe7ecf Mon Sep 17 00:00:00 2001 From: prculley Date: Mon, 26 Dec 2016 14:26:53 -0600 Subject: [PATCH] bug 9854; Error dialog can become hidden behind merge dialog --- gramps/gui/merge/mergeperson.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gramps/gui/merge/mergeperson.py b/gramps/gui/merge/mergeperson.py index 19b8ef310..f54e51527 100644 --- a/gramps/gui/merge/mergeperson.py +++ b/gramps/gui/merge/mergeperson.py @@ -345,10 +345,10 @@ class MergePerson(ManagedWindow): "for this merge were too complex to automatically " "handle. We recommend that you go to Relationships " "view and see if additional manual merging of families " - "is necessary."), parent=self.uistate.window) + "is necessary."), parent=self.window) except MergeError as err: ErrorDialog(_("Cannot merge people"), str(err), - parent=self.uistate.window) + parent=self.window) self.uistate.set_busy_cursor(False) self.close() if self.update: