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

bug 9854; Error dialog can become hidden behind merge dialog

Browse Source
This commit is contained in:
prculley 2016-12-26 14:26:53 -06:00 committed by Nick Hall
parent 34d6ddada0
commit f92903b1f7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gramps/gui/merge/mergeperson.py
View File

@ -345,10 +345,10 @@ class MergePerson(ManagedWindow):
"for this merge were too complex to automatically " "for this merge were too complex to automatically "
"handle. We recommend that you go to Relationships " "handle. We recommend that you go to Relationships "
"view and see if additional manual merging of families " "view and see if additional manual merging of families "
"is necessary."), parent=self.uistate.window) "is necessary."), parent=self.window)
except MergeError as err: except MergeError as err:
ErrorDialog(_("Cannot merge people"), str(err), ErrorDialog(_("Cannot merge people"), str(err),
parent=self.uistate.window) parent=self.window)
self.uistate.set_busy_cursor(False) self.uistate.set_busy_cursor(False)
self.close() self.close()
if self.update: if self.update: