From 5569f78767c16006b4ee9eefe18d60c18a3fe6bf Mon Sep 17 00:00:00 2001
From: Alex Roitman <shura@gramps-project.org>
Date: Sun, 30 Jul 2006 03:34:10 +0000
Subject: [PATCH] 	* src/PageView.py (PersonNavView.filter_editor): Catch
 exception. 	* src/DataViews/_FamilyList.py (FamilyListView.filter_editor):
 	Catch exception. 	* src/plugins/EventCmp.py
 (EventComparison.filter_editor_clicked): 	Catch exception.

svn: r7091
---
 ChangeLog                    |  5 +++++
 src/DataViews/_FamilyList.py | 10 +++++-----
 src/PageView.py              | 11 ++++++-----
 src/plugins/EventCmp.py      |  8 ++++++--
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e6e600f8e..af70153ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 2006-07-29  Alex Roitman  <shura@gramps-project.org>
+	* src/PageView.py (PersonNavView.filter_editor): Catch exception.
+	* src/DataViews/_FamilyList.py (FamilyListView.filter_editor):
+	Catch exception.
+	* src/plugins/EventCmp.py (EventComparison.filter_editor_clicked):
+	Catch exception.
 	* src/ManagedWindow.py (ManagedWindow.show): Set opened flag;
 	(ManagedWindow.close): Unset opened flag.
 	* src/ViewManager.py (undo_history_close): Only close undo history
diff --git a/src/DataViews/_FamilyList.py b/src/DataViews/_FamilyList.py
index 1d92c062d..4a8804fb9 100644
--- a/src/DataViews/_FamilyList.py
+++ b/src/DataViews/_FamilyList.py
@@ -100,11 +100,11 @@ class FamilyListView(PageView.ListView):
     def filter_editor(self,obj):
         from FilterEditor import FilterEditor
 
-        FilterEditor(
-            'Family',
-            const.custom_filters,
-            self.dbstate,
-            self.uistate)
+        try:
+            FilterEditor('Family',const.custom_filters,
+                         self.dbstate,self.uistate)
+        except Errors.WindowActiveError:
+            pass            
 
     def add_bookmark(self, obj):
         mlist = []
diff --git a/src/PageView.py b/src/PageView.py
index 3f8b9b65f..61ecba794 100644
--- a/src/PageView.py
+++ b/src/PageView.py
@@ -45,6 +45,7 @@ from gtk.gdk import ACTION_COPY, BUTTON1_MASK
 import Config
 import TreeTips
 import Bookmarks
+import Errors
 from Filters import SearchBar
 import const
 
@@ -367,11 +368,11 @@ class PersonNavView(BookMarkView):
     def filter_editor(self,obj):
         from FilterEditor import FilterEditor
 
-        FilterEditor(
-            'Person',
-            const.custom_filters,
-            self.dbstate,
-            self.uistate)
+        try:
+            FilterEditor('Person',const.custom_filters,
+                         self.dbstate,self.uistate)
+        except Errors.WindowActiveError:
+            pass
 
     def fwd_clicked(self,obj,step=1):
         hobj = self.uistate.phistory
diff --git a/src/plugins/EventCmp.py b/src/plugins/EventCmp.py
index 219470472..56b334b8f 100644
--- a/src/plugins/EventCmp.py
+++ b/src/plugins/EventCmp.py
@@ -50,6 +50,7 @@ import Utils
 import BaseDoc
 import ODSDoc
 import const
+import Errors
 import DateHandler
 from QuestionDialog import WarningDialog
 from PluginUtils import Tool, register_tool
@@ -177,8 +178,11 @@ class EventComparison(Tool.Tool,ManagedWindow.ManagedWindow):
 
     def filter_editor_clicked(self,obj):
         import FilterEditor
-        FilterEditor.FilterEditor('Person',const.custom_filters,
-                                  self.dbstate,self.uistate)
+        try:
+            FilterEditor.FilterEditor('Person',const.custom_filters,
+                                      self.dbstate,self.uistate)
+        except Errors.WindowActiveError:
+            pass
 
     def on_apply_clicked(self,obj):
         cfilter = self.filter_menu.get_active().get_data("filter")