From 9d760ccad03f28705e7b89db28cd0d4e2c0419c2 Mon Sep 17 00:00:00 2001
From: Brian Matherly <brian@gramps-project.org>
Date: Wed, 7 Feb 2007 04:00:49 +0000
Subject: [PATCH] * src/ReportBase/_ReportDialog.py: 0000905: Typo in catching
 exceptions in buggy reports

svn: r8067
---
 ChangeLog                       | 4 ++++
 src/ReportBase/_ReportDialog.py | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 89a5f5791..646a81fa4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-02-06  Douglas Blank  <dblank@cs.brynmawr.edu>
+	* src/ReportBase/_ReportDialog.py: 0000905: Typo in catching exceptions in 
+	  buggy reports
+
 2007-02-06  Don Allingham  <don@gramps-project.org>
 	* src/GrampsDb/_ReadGedcom.py: fix cal/est parsing
 	* src/DisplayTabs/_ButtonTab.py: catch window already being open
diff --git a/src/ReportBase/_ReportDialog.py b/src/ReportBase/_ReportDialog.py
index 56bfac5cf..5fa73ee19 100644
--- a/src/ReportBase/_ReportDialog.py
+++ b/src/ReportBase/_ReportDialog.py
@@ -667,11 +667,11 @@ def report(dbstate,uistate,person,report_class,options_class,
     elif category in (CATEGORY_BOOK,CATEGORY_CODE,CATEGORY_VIEW,CATEGORY_WEB):
         try:
             report_class(dbstate,uistate,person)
-	except Error, msg:
-	    ErrorDialog(_("Error generating report"),
-			str(msg))
         except Errors.WindowActiveError:
             pass
+        except Exception, msg:
+	    ErrorDialog(_("Error generating report"),
+			str(msg))
         return        
     else:
         dialog_class = ReportDialog