diff --git a/ChangeLog b/ChangeLog
index c37c7e8bd..8944d4db9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-10  Martin Hawlisch  <Martin.Hawlisch@gmx.de>
+	* src/DataViews/_RelationView.py (change_person): Break endless loop
+	by passing the return values from _change_person.
+
 2006-12-10  Brian Matherly  <brian@gramps-project.org>
 	* src/plugins/NarrativeWeb.py: fix 0000597: Narrative web site 
 		generates uppercase directory names but lower case hrefs
diff --git a/src/DataViews/_RelationView.py b/src/DataViews/_RelationView.py
index 8103006ab..508ab0143 100644
--- a/src/DataViews/_RelationView.py
+++ b/src/DataViews/_RelationView.py
@@ -373,10 +373,11 @@ class RelationshipView(PageView.PersonNavView):
         
     def change_person(self, obj):
         try:
-            self._change_person(obj)
+            return self._change_person(obj)
         except AttributeError, msg:
             from QuestionDialog import RunDatabaseRepair
             RunDatabaseRepair(msg)
+            return True
 
     def _change_person(self, obj):
         if self.redrawing: