5109: Error when merging duplicate records

svn: r18012

src/Merge/mergeevent.py

@@ -185,6 +185,7 @@ class MergeEvents(ManagedWindow.ManagedWindow):
         
         query = MergeEventQuery(self.dbstate, phoenix, titanic)
         query.execute()
+        if self.uistate.viewmanager.active_page.selection:
             self.uistate.viewmanager.active_page.selection.unselect_path(
                     unselect_path)
         self.uistate.set_busy_cursor(False)

src/Merge/mergefamily.py

@@ -221,6 +221,7 @@ class MergeFamilies(ManagedWindow.ManagedWindow):
             query.execute()
         except MergeError, err:
             ErrorDialog( _("Cannot merge people"), str(err))
+        if self.uistate.viewmanager.active_page.selection:
             self.uistate.viewmanager.active_page.selection.unselect_path(
                     unselect_path)
         self.uistate.set_busy_cursor(False)

src/Merge/mergemedia.py

@@ -165,6 +165,7 @@ class MergeMediaObjects(ManagedWindow.ManagedWindow):
 
         query = MergeMediaQuery(self.dbstate, phoenix, titanic)
         query.execute()
+        if self.uistate.viewmanager.active_page.selection:
             self.uistate.viewmanager.active_page.selection.unselect_path(
                     unselect_path)
         self.close()

src/Merge/mergenote.py

@@ -175,6 +175,7 @@ class MergeNotes(ManagedWindow.ManagedWindow):
 
         query = MergeNoteQuery(self.dbstate, phoenix, titanic)
         query.execute()
+        if self.uistate.viewmanager.active_page.selection:
             self.uistate.viewmanager.active_page.selection.unselect_path(
                     unselect_path)
         self.close()

src/Merge/mergeperson.py

@@ -325,6 +325,7 @@ class MergePeople(ManagedWindow.ManagedWindow):
             query.execute()
         except MergeError, err:
             ErrorDialog( _("Cannot merge people"), str(err))
+        if self.uistate.viewmanager.active_page.selection:
             self.uistate.viewmanager.active_page.selection.unselect_path(
                     unselect_path)
         self.uistate.set_busy_cursor(False)

src/Merge/mergeplace.py

@@ -190,6 +190,7 @@ class MergePlaces(ManagedWindow.ManagedWindow):
 
         query = MergePlaceQuery(self.dbstate, phoenix, titanic)
         query.execute()
+        if self.uistate.viewmanager.active_page.selection:
             self.uistate.viewmanager.active_page.selection.unselect_path(
                     unselect_path)
         self.uistate.set_busy_cursor(False)

src/Merge/mergerepository.py

@@ -151,6 +151,7 @@ class MergeRepositories(ManagedWindow.ManagedWindow):
 
         query = MergeRepoQuery(self.dbstate, phoenix, titanic)
         query.execute()
+        if self.uistate.viewmanager.active_page.selection:
             self.uistate.viewmanager.active_page.selection.unselect_path(
                     unselect_path)
         self.uistate.set_busy_cursor(False)

src/Merge/mergesource.py

@@ -178,6 +178,7 @@ class MergeSources(ManagedWindow.ManagedWindow):
 
         query = MergeSourceQuery(self.dbstate, phoenix, titanic)
         query.execute()
+        if self.uistate.viewmanager.active_page.selection:
             self.uistate.viewmanager.active_page.selection.unselect_path(
                     unselect_path)
         self.uistate.set_busy_cursor(False)