X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fsignal.cpp;h=02a07d76bc9585861b4c7df0a0954f3060772d7c;hb=4655bb74f9d6d7f6db8fca9e22721e6c0e1ada12;hp=3ec1623bf4249f5f652ed39a890568c57bbfa36d;hpb=5929b101ee38b5668b328e7b1eac4bf49c912412;p=r2c2.git

diff --git a/source/libr2c2/signal.cpp b/source/libr2c2/signal.cpp
index 3ec1623..02a07d7 100644
--- a/source/libr2c2/signal.cpp
+++ b/source/libr2c2/signal.cpp
@@ -107,12 +107,16 @@ void Signal::tick(const Time::TimeDelta &)
 	if(check_allocated_blocks)
 	{
 		unsigned n_blocks = 0;
-		BlockIter iter = block.next();
-		while(iter && iter->get_train()==train)
+		const Block *last = train->get_block_allocator().last().block();
+		if(block.block()!=last)
 		{
-			if(iter->get_sensor_address())
-				++n_blocks;
-			iter=iter.next();
+			BlockIter iter = block.next();
+			while(iter && iter->get_train()==train && iter.block()!=last)
+			{
+				if(iter->get_sensor_address())
+					++n_blocks;
+				iter = iter.next();
+			}
 		}
 		check_allocated_blocks = false;