X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Froute.cpp;h=38ea9f681d77da64f10600b369124c27724aca59;hb=1fc9750d1886c0a7822965700e6501090f92f4cc;hp=e3dfe36961c66a5a9e37d518373cc927d18df4c2;hpb=0b75458245997b9df6da47cc4534341c8426084b;p=r2c2.git

diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp
index e3dfe36..38ea9f6 100644
--- a/source/libr2c2/route.cpp
+++ b/source/libr2c2/route.cpp
@@ -134,9 +134,9 @@ string bad_route::get_message(RouteValidityMask valid)
 	unsigned i = 0;
 	if(!(valid&1))
 		reasons[i++] = "unlinked";
-	else if(!(valid&2))
+	if(!(valid&2))
 		reasons[i++] = "branching";
-	else if(!(valid&4))
+	if(!(valid&4))
 		reasons[i++] = "not smooth";
 	return join(reasons, reasons+i, ", ");
 }
@@ -272,14 +272,21 @@ void Route::add_tracks(const set<Track *> &trks)
 		if(!tracks.count(*i))
 			pending.insert(*i);
 
+	if(tracks.empty())
+	{
+		set<Track *>::iterator i = pending.begin();
+		tracks.insert(*i);
+		pending.erase(i);
+	}
+
 	while(!pending.empty())
 	{
 		RouteValidityMask valid = ROUTE_INVALID;
-		for(set<Track *>::const_iterator i=pending.begin(); i!=pending.end(); ++i)
-			if(tracks.empty() || (valid=check_validity(**i))==ROUTE_VALID)
+		for(set<Track *>::iterator i=pending.begin(); i!=pending.end(); ++i)
+			if((valid=check_validity(**i))==ROUTE_VALID)
 			{
 				tracks.insert(*i);
-				pending.erase(*i);
+				pending.erase(i);
 				break;
 			}