X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Froute.cpp;h=5ee30e033161030fa31a8f558f50e7f4a3b9aaea;hb=066170fbc56bb5bd33a5ce0b9b7b668a3f539ee6;hp=5b37fcc06f3f7d381ec63309d9450ffde7f9e558;hpb=1ac853ffc606b29ffd88b923ed3551ee6282afb2;p=r2c2.git

diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp
index 5b37fcc..5ee30e0 100644
--- a/source/libr2c2/route.cpp
+++ b/source/libr2c2/route.cpp
@@ -215,10 +215,10 @@ int Route::get_turnout(unsigned id) const
 
 unsigned Route::get_path(Track &trk) const
 {
-	if(unsigned taddr = trk.get_turnout_address())
+	if(trk.get_type().is_turnout())
 	{
-		map<unsigned, int>::const_iterator i = turnouts.find(taddr);
-		if(i!=turnouts.end())
+		map<unsigned, int>::const_iterator i = turnouts.find(trk.get_turnout_address());
+		if(i!=turnouts.end() && i->second>=0)
 			return i->second;
 	}
 	return trk.get_active_path();