From 20cade81328a29b2f496318d9569745251286c34 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Mon, 12 Feb 2007 17:24:43 +0000
Subject: [PATCH] 2007-02-12  Don Allingham  <don@gramps-project.org> 	*
 src/plugins/FindDupes.py: catch window already open message

svn: r8091
---
 ChangeLog                | 3 +++
 help/C/gramps.xml        | 4 ++--
 src/plugins/FindDupes.py | 8 ++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0f3d468d0..abb1e719c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-02-12  Don Allingham  <don@gramps-project.org>
+	* src/plugins/FindDupes.py: catch window already open message
+
 2007-02-11  Don Allingham  <don@gramps-project.org>
 	* src/Merge/_MergePlace.py (MergePlaces.merge): fix typo on 
 	add_source_reference
diff --git a/help/C/gramps.xml b/help/C/gramps.xml
index 21d13d499..ff3316f99 100644
--- a/help/C/gramps.xml
+++ b/help/C/gramps.xml
@@ -6826,7 +6826,7 @@
           project, to ensure compatibility or import/export options to your
           new format of a project.</para>
 
-          <para>If, however, you would like the GRAMPS project to to adopt
+          <para>If, however, you would like the GRAMPS project to adopt
           your strategy, you would need to convince GRAMPS developers that
           your strategy is good for GRAMPS and superior to the present
           development strategy.</para>
@@ -7943,7 +7943,7 @@
           may type:</term>
 
           <listitem>
-            <para><command>gramps -i<filename>file1.ged</filename> -i
+            <para><command>gramps -i <filename>file1.ged</filename> -i
             <filename>file2.gpkg</filename> -i
             <filename>~/db3.gramps</filename> -i
             <filename>file4.wft</filename> -a
diff --git a/src/plugins/FindDupes.py b/src/plugins/FindDupes.py
index d65df0f08..ed7b2ccb3 100644
--- a/src/plugins/FindDupes.py
+++ b/src/plugins/FindDupes.py
@@ -48,6 +48,7 @@ import Utils
 import soundex
 import NameDisplay
 import ListModel
+import Errors
 from Merge import PersonCompare
 import GrampsDisplay
 import ManagedWindow
@@ -173,8 +174,11 @@ class Merge(Tool.Tool,ManagedWindow.ManagedWindow):
                 _("No matches found"),
                 _("No potential duplicate people were found"))
         else:
-            ShowMatches(self.dbstate,self.uistate,self.track,
-                        self.list,self.map,self.update)
+	    try:
+		ShowMatches(self.dbstate,self.uistate,self.track,
+			    self.list,self.map,self.update)
+	    except Errors.WindowActiveError:
+		pass
     
     def find_potentials(self,thresh):
         self.progress = Utils.ProgressMeter(_('Find duplicates'),