From 2b0dcea160c8697fc12afecaa776f3b364a35d28 Mon Sep 17 00:00:00 2001 From: Martin Hawlisch Date: Tue, 19 Apr 2005 19:34:22 +0000 Subject: [PATCH] * GenericFilter.py: Don't crash on corrupt database svn: r4382 --- ChangeLog | 1 + src/GenericFilter.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3e0a248b1..c6437e3ea 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ * src/gramps_main.py: Removed canvas specific calls of the PedView * src/GrampsDbBase.py (create_id): Use sys.maxint to get the maximum possible integer number + * GenericFilter.py: Don't crash on corrupt database 2005-04-18 Don Allingham * src/edit_person.glade: re-add edit_person.glade diff --git a/src/GenericFilter.py b/src/GenericFilter.py index ce50729f7..a2d71cdcc 100644 --- a/src/GenericFilter.py +++ b/src/GenericFilter.py @@ -1950,7 +1950,7 @@ class HasTextMatchingSubstringOf(Rule): event = self.db.get_event_from_handle(event_handle) if self.match_object(event): match = 1 - else: + elif event: place_handle = event.get_place_handle() if place_handle: if self.search_place(place_handle): @@ -1985,6 +1985,8 @@ class HasTextMatchingSubstringOf(Rule): self.place_map[handle] = 1 def match_object(self,obj): + if not obj: + return 0 if self.regexp_match: return obj.matches_regexp(self.list[0],self.case_sensitive) return obj.matches_string(self.list[0],self.case_sensitive)