Merge branch 'jgrpp' into jgrpp-nrt

2019-07-29 22:50:51 +01:00
parent 6f840a5c80 704eaf80f6
commit 7ed86e7488
10 changed files with 26 additions and 11 deletions
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -1926,8 +1926,10 @@ CommandCost CmdRemoveSingleSignal(TileIndex tile, DoCommandFlag flags, uint32 p1
 			auto check_reservation = [&](TileIndex t) {
 				if (HasAcrossTunnelBridgeReservation(t)) {
 					Train *v = GetTrainForReservation(t, FindFirstTrack(GetAcrossTunnelBridgeReservationTrackBits(t)));
-					if (v != nullptr) FreeTrainTrackReservation(v);
-					re_reserve_trains.push_back(v);
+					if (v != nullptr) {
+						FreeTrainTrackReservation(v);
+						re_reserve_trains.push_back(v);
+					}
 				}
 			};
 			check_reservation(tile);