5109: Error when merging duplicate records

svn: r18012
2011-08-08 21:04:03 +00:00
parent 2176d10611
commit b46a74df36
8 changed files with 24 additions and 16 deletions
--- a/src/Merge/mergeevent.py
+++ b/src/Merge/mergeevent.py
@ -185,8 +185,9 @@ class MergeEvents(ManagedWindow.ManagedWindow):
        
        query = MergeEventQuery(self.dbstate, phoenix, titanic)
        query.execute()
-        self.uistate.viewmanager.active_page.selection.unselect_path(
-                unselect_path)
+        if self.uistate.viewmanager.active_page.selection:
+            self.uistate.viewmanager.active_page.selection.unselect_path(
+                    unselect_path)
        self.uistate.set_busy_cursor(False)
        self.close()