X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Fblockallocator.cpp;h=347960ee2ec584029a7bc66dffaaabb56de0cdad;hb=b0d402f30489b0618d21281781e1b8f683ed567b;hp=a054c157331c9b5e9ed074da4fc99469e2b0ee8e;hpb=13f72e25cd6cb68d7fa0c0ab798616a148c39e43;p=r2c2.git

diff --git a/source/libr2c2/blockallocator.cpp b/source/libr2c2/blockallocator.cpp
index a054c15..347960e 100644
--- a/source/libr2c2/blockallocator.cpp
+++ b/source/libr2c2/blockallocator.cpp
@@ -257,10 +257,17 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
 	/* Add it to the list first to present a consistent state in block_reserved
 	signal. */
 	blocks.push_back(block);
+
+	bool first_reserve = (cur_blocks_end==blocks.end());
+	if(first_reserve)
+		--cur_blocks_end;
+
 	try
 	{
 		if(!block->reserve(&train))
 		{
+			if(first_reserve)
+				cur_blocks_end = blocks.end();
 			blocks.pop_back();
 			return false;
 		}
@@ -269,6 +276,8 @@ bool BlockAllocator::reserve_block(const BlockIter &block)
 	}
 	catch(...)
 	{
+		if(first_reserve)
+			cur_blocks_end = blocks.end();
 		blocks.pop_back();
 		throw;
 	}
@@ -413,7 +422,7 @@ void BlockAllocator::reverse()
 
 void BlockAllocator::turnout_path_changing(Track &track)
 {
-	BlockList::iterator i = find_if(blocks.begin(), blocks.end(), BlockMatch(track.get_block()));
+	BlockList::iterator i = find_if(cur_blocks_end, blocks.end(), BlockMatch(track.get_block()));
 	if(i!=blocks.end())
 	{
 		++i;