Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/DisplayModels.py: fix bad index into list

Browse Source 
* src/Relationship.py: handle race condition where the screen
wants to update with a stale family handle after the database
has been closed and the internal data has not be rebuilt.

* src/GenericFilter.py: Don't crash on corrupt database


svn: r4384
This commit is contained in:
Don Allingham 2005-04-20 16:45:00 +00:00
parent 17310bf436
commit dc3fb33c1e
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps2/ChangeLog
View File

@ -1,5 +1,11 @@
2005-04-20 Don Allingham <don@gramps-project.org>
* src/DisplayModels.py: fix bad index into list
* src/Relationship.py: handle race condition where the screen
wants to update with a stale family handle after the database
has been closed and the internal data has not be rebuilt.
2005-04-19 Martin Hawlisch <Martin.Hawlisch@gmx.de> 2005-04-19 Martin Hawlisch <Martin.Hawlisch@gmx.de>
* GenericFilter.py: Don't crash on corrupt database * src/GenericFilter.py: Don't crash on corrupt database
2005-04-19 Eero Tamminen <eerot@sf> 2005-04-19 Eero Tamminen <eerot@sf>
* src/GenericFilter.py: Fix typo * src/GenericFilter.py: Fix typo

2
gramps2/src/DisplayModels.py
View File

@ -111,7 +111,7 @@ class BaseModel(gtk.GenericTreeModel):
def on_get_path(self, node): def on_get_path(self, node):
'''returns the tree path (a tuple of indices at the various '''returns the tree path (a tuple of indices at the various
levels) for a particular node.''' levels) for a particular node.'''
return self.indexlist[node[0]] return self.indexlist[node]
def on_get_column_type(self,index): def on_get_column_type(self,index):
return gobject.TYPE_STRING return gobject.TYPE_STRING

4
gramps2/src/Relationship.py
View File

@ -170,8 +170,8 @@ class RelationshipCalculator:
pmap[person.get_handle()] = rel_str pmap[person.get_handle()] = rel_str
family_handle = person.get_main_parents_family_handle() family_handle = person.get_main_parents_family_handle()
if family_handle != None: family = self.db.get_family_from_handle(family_handle)
family = self.db.get_family_from_handle(family_handle) if family_handle != None and family:
father = self.db.get_person_from_handle(family.get_father_handle()) father = self.db.get_person_from_handle(family.get_father_handle())
mother = self.db.get_person_from_handle(family.get_mother_handle()) mother = self.db.get_person_from_handle(family.get_mother_handle())
self.apply_filter(father,rel_str+'f',plist,pmap) self.apply_filter(father,rel_str+'f',plist,pmap)