From ddccd7e7bcf3c03e5aa236c1270a5cd0b64a8828 Mon Sep 17 00:00:00 2001
From: Don Allingham <don@gramps-project.org>
Date: Mon, 12 Feb 2007 23:52:59 +0000
Subject: [PATCH] 2007-02-12  Don Allingham  <don@gramps-project.org> 	*
 src/plugins/FindDupes.py: backport from 2.2.6

svn: r8095
---
 ChangeLog                         | 3 +++
 src/GrampsDb/_GrampsBSDDB.py      | 2 +-
 src/GrampsDbUtils/_GedcomParse.py | 6 ------
 src/plugins/FindDupes.py          | 8 ++++++--
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a378f8447..db8dbcded 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2007-02-12  Don Allingham  <don@gramps-project.org>
+	* src/plugins/FindDupes.py: backport from 2.2.6
+
 2007-02-12  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
 	* src/MarkupText.py: cleanup
 	* src/DisplayTabs/_NoteTab.py (build_interface): debug log
diff --git a/src/GrampsDb/_GrampsBSDDB.py b/src/GrampsDb/_GrampsBSDDB.py
index 3c96e55da..a11b495e2 100644
--- a/src/GrampsDb/_GrampsBSDDB.py
+++ b/src/GrampsDb/_GrampsBSDDB.py
@@ -331,7 +331,7 @@ class GrampsBSDDB(GrampsDbBase,UpdateCallback):
         self.brief_name = os.path.basename(name)
 
         self.env = db.DBEnv()
-        self.env.set_cachesize(0,0x2000000)         # 16MB
+        self.env.set_cachesize(0,0x4000000)         # 32MB
 
         if self.UseTXN:
             # These env settings are only needed for Txn environment
diff --git a/src/GrampsDbUtils/_GedcomParse.py b/src/GrampsDbUtils/_GedcomParse.py
index d47c7f8eb..cfe0072bb 100644
--- a/src/GrampsDbUtils/_GedcomParse.py
+++ b/src/GrampsDbUtils/_GedcomParse.py
@@ -3356,12 +3356,6 @@ if __name__ == "__main__":
         pr.runcall(g.parse_gedcom_file,False)
         print "Finished"
         pr.close()
-##         print "Loading profile"
-##         stats = hotshot.stats.load('mystats.profile')
-##         print "done"
-##         stats.strip_dirs()
-##         stats.sort_stats('time','calls')
-##         stats.print_stats(100)
     else:
         t = time.time()
         g.parse_gedcom_file(False)        
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'),