1.1 --- a/mainwindow.cpp	Tue May 26 11:24:51 2009 +0000
     1.2 +++ b/mainwindow.cpp	Wed Jun 03 20:37:17 2009 +0000
     1.3 @@ -1131,7 +1131,7 @@
     1.4  	setupFlag (flag,tb,"system-scrolledright",tr("subtree is scrolled","SystemFlag"));
     1.5  	
     1.6  	flag->load(QPixmap(flagsPath+"flag-tmpUnscrolled-right.png"));
     1.7 -	setupFlag (flag,tb,"system-tmpUnscrolledright",tr("subtree is temporary scrolled","SystemFlag"));
     1.8 +	setupFlag (flag,tb,"system-tmpUnscrolledRight",tr("subtree is temporary scrolled","SystemFlag"));
     1.9  
    1.10  	flag->load(QPixmap(flagsPath+"flag-hideexport.png"));
    1.11  	setupFlag (flag,tb,"system-hideInExport",tr("Hide object in exported maps","SystemFlag"));
    1.12 @@ -2770,22 +2770,21 @@
    1.13  	VymModel *m=currentModel();
    1.14  	if (m)
    1.15  	{
    1.16 -		BranchItem *bi=m->createBranch();
    1.17 -
    1.18 -		if (bi) 
    1.19 +		BranchItem *bi=m->addNewBranch();
    1.20 +		if (!bi) return;
    1.21 +
    1.22 +		if (actionSettingsAutoEditNewBranch->isOn() 
    1.23 +		     && !actionSettingsAutoSelectNewBranch->isOn() )
    1.24 +			prevSelection=m->getSelectString();
    1.25 +		else	
    1.26 +			prevSelection=QString();
    1.27 +
    1.28 +		if (actionSettingsAutoSelectNewBranch->isOn()  
    1.29 +			|| actionSettingsAutoEditNewBranch->isOn()) 
    1.30 +		{
    1.31  			m->select (bi);
    1.32 -		else
    1.33 -			return;
    1.34 -
    1.35 -		if (actionSettingsAutoEditNewBranch->isOn())
    1.36 -		{
    1.37 -			currentMapEditor()->editHeading();
    1.38 -			return;
    1.39 -		}	
    1.40 -		if (!prevSelection.isEmpty()) 
    1.41 -		{
    1.42 -			m->select(prevSelection);
    1.43 -			prevSelection="";
    1.44 +			if (actionSettingsAutoEditNewBranch->isOn())
    1.45 +				currentMapEditor()->editHeading();
    1.46  		}
    1.47  	}	
    1.48  }