diff --git a/src/PedView.py b/src/PedView.py index c0c536aaa..e77369b9c 100644 --- a/src/PedView.py +++ b/src/PedView.py @@ -382,15 +382,10 @@ class PedigreeView: if depth > 5 or person == None: return - family = person.getMainFamily() - frel = 0 - mrel = 0 - if family == None: - l = person.getAltFamilyList() - if len(l) > 0: - (family,m,f) = l[0] - mrel = (m != "Birth") - frel = (f != "Birth") + (family,m,f) = person.getMainFamilyRel() + if family: + mrel = (m != "Birth") + frel = (f != "Birth") list[index] = (person,val) if family != None: diff --git a/src/RelLib.py b/src/RelLib.py index 119c44d89..4cd8c724c 100644 --- a/src/RelLib.py +++ b/src/RelLib.py @@ -1120,9 +1120,9 @@ class Person: """returns the main Family of the Person, the Family in which the Person is a natural born child""" if len(self.AltFamilyList) == 0: - return None + return (None,None,None) else: - return self.AltFamilyList + return self.AltFamilyList[0] def setNote(self,text): """sets the note attached to the Person to the passed text"""