diff -r 2f002657dada -r 6e4b586aa88a mainwindow.cpp
--- a/mainwindow.cpp	Tue May 26 11:24:51 2009 +0000
+++ b/mainwindow.cpp	Wed Jun 03 20:37:17 2009 +0000
@@ -1131,7 +1131,7 @@
 	setupFlag (flag,tb,"system-scrolledright",tr("subtree is scrolled","SystemFlag"));
 	
 	flag->load(QPixmap(flagsPath+"flag-tmpUnscrolled-right.png"));
-	setupFlag (flag,tb,"system-tmpUnscrolledright",tr("subtree is temporary scrolled","SystemFlag"));
+	setupFlag (flag,tb,"system-tmpUnscrolledRight",tr("subtree is temporary scrolled","SystemFlag"));
 
 	flag->load(QPixmap(flagsPath+"flag-hideexport.png"));
 	setupFlag (flag,tb,"system-hideInExport",tr("Hide object in exported maps","SystemFlag"));
@@ -2770,22 +2770,21 @@
 	VymModel *m=currentModel();
 	if (m)
 	{
-		BranchItem *bi=m->createBranch();
-
-		if (bi) 
+		BranchItem *bi=m->addNewBranch();
+		if (!bi) return;
+
+		if (actionSettingsAutoEditNewBranch->isOn() 
+		     && !actionSettingsAutoSelectNewBranch->isOn() )
+			prevSelection=m->getSelectString();
+		else	
+			prevSelection=QString();
+
+		if (actionSettingsAutoSelectNewBranch->isOn()  
+			|| actionSettingsAutoEditNewBranch->isOn()) 
+		{
 			m->select (bi);
-		else
-			return;
-
-		if (actionSettingsAutoEditNewBranch->isOn())
-		{
-			currentMapEditor()->editHeading();
-			return;
-		}	
-		if (!prevSelection.isEmpty()) 
-		{
-			m->select(prevSelection);
-			prevSelection="";
+			if (actionSettingsAutoEditNewBranch->isOn())
+				currentMapEditor()->editHeading();
 		}
 	}	
 }