X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrainrouter.cpp;h=9a86263b9bec5922fa58d8201529731e79c01944;hb=c435f10d8de8a4058c43bcfc6c7073c8a8798463;hp=a6a47c0b5b13a291e30096795c87d2f8c1908628;hpb=c796e17cef61ad2e3f476b6037892d7bc6c52680;p=r2c2.git

diff --git a/source/libr2c2/trainrouter.cpp b/source/libr2c2/trainrouter.cpp
index a6a47c0..9a86263 100644
--- a/source/libr2c2/trainrouter.cpp
+++ b/source/libr2c2/trainrouter.cpp
@@ -371,10 +371,15 @@ Route *TrainRouter::create_lead_route(Route *lead, const Route *target)
 bool TrainRouter::advance_route(RouteList::iterator &iter, const Block &block)
 {
 	const set<Track *> &tracks = block.get_tracks();
+	unsigned turnout_addr = block.get_turnout_address();
 	for(; iter!=routes.end(); ++iter)
+	{
+		if(turnout_addr && (*iter)->get_turnout(turnout_addr)<0)
+			continue;
 		for(set<Track *>::const_iterator j=tracks.begin(); j!=tracks.end(); ++j)
 			if((*iter)->has_track(**j))
 				return true;
+	}
 
 	return false;
 }