diff -r 462d39502273 -r 96402b172173 branchobj.cpp
--- a/branchobj.cpp	Wed Jul 16 11:56:44 2008 +0000
+++ b/branchobj.cpp	Wed Oct 29 17:42:34 2008 +0000
@@ -813,7 +813,7 @@
 	// Providing an ID for a branch makes export to XHTML easier
 	QString idAttr;
 	if (countXLinks()>0)
-		idAttr=attribut ("id",mapEditor->getModel()->getSelectString(this)); //TODO directly access model
+		idAttr=attribut ("id",model->getSelectString(this)); //TODO directly access model
 	else
 		idAttr="";
 
@@ -1611,7 +1611,7 @@
 
 QString BranchObj::getSelectString()
 {
-	return mapEditor->getModel()->getSelectString (this);
+	return model->getSelectString (this);
 }
 
 void BranchObj::setAnimation(const AnimPoint &ap)
@@ -1627,6 +1627,7 @@
 		setRelPos (anim);
 		return true;
 	}
+	parObj->reposition();	// we might have been relinked meanwhile
 	return false;
 }