X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Ftrain.cpp;h=5b03e9b5e6946827a966080de5fb86084a8db0fa;hb=cb222b6df855da4196a331c5b9859750c4321fa0;hp=b2b4899f9aa6eb7cc1ad83cee23039d073c4b5f4;hpb=baa096deb2108fe7f692172602ec2d047b68c068;p=r2c2.git

diff --git a/source/libr2c2/train.cpp b/source/libr2c2/train.cpp
index b2b4899..5b03e9b 100644
--- a/source/libr2c2/train.cpp
+++ b/source/libr2c2/train.cpp
@@ -1294,7 +1294,7 @@ bool Train::is_valid_diversion(const Route &diversion, const TrackIter &from)
 
 		track1 = track1.next(path);
 
-		if(track1.looped())
+		if(!track1 || track1.looped())
 			return false;
 	}
 
@@ -1312,6 +1312,8 @@ bool Train::is_valid_diversion(const Route &diversion, const TrackIter &from)
 		bool ok = (track2!=from && diversion.has_track(*track2));
 
 		track2 = track2.next(path);
+		if(!track2)
+			return false;
 
 		if(ok)
 			break;