diff -r ffb95cd03156 -r 8c028a5d9083 xml-vym.cpp
--- a/xml-vym.cpp	Thu Apr 30 11:52:49 2009 +0000
+++ b/xml-vym.cpp	Fri May 01 10:30:29 2009 +0000
@@ -229,8 +229,7 @@
 	} else if ( eName == "branch" && state == StateMapCenter) 
 	{
 		state=StateBranch;
-		model->createBranch();
-		lastBranchItem=model->getSelectedBranchItem();
+		lastBranchItem=model->createBranch();
 		readBranchAttr (atts);
 	} else if ( eName == "htmlnote" && state == StateBranch) 
 	{
@@ -250,8 +249,7 @@
 		if (!readXLinkAttr (atts)) return false;
     } else if ( eName == "branch" && state == StateBranch ) 
 	{
-		model->createBranch();
-		lastBranchItem=model->getSelectedBranchItem();
+		lastBranchItem=model->createBranch();
 		readBranchAttr (atts);
     } else if ( eName == "html" && state == StateHtmlNote ) 
 	{
@@ -353,14 +351,12 @@
 {
 	branchesCurrent++;
 	mainWindow->setProgressValue (branchesCurrent);
-	//lastOO=lastBranch;
-	//lastBranchItem=(BranchItem*)(lastBranch->getTreeItem());
 
 	if (!readOOAttr(a)) return false;
-/*
 
 	if (!a.value( "scrolled").isEmpty() )
 		lastBranchItem->toggleScroll();
+/*
 	if (!a.value( "frameType").isEmpty() ) 
 		lastOO->setFrameType (a.value("frameType")); //Compatibility 1.8.1