Skip to content

Commit 6792463

Browse files
committed
Automatic merge of T1.6-rc8-48-ga5be129223 and 14 pull requests
- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc) - Pull request #1091 at 9b80fac: Automatic speed control - Pull request #1104 at ccc5c4d: Handle simple adhesion within the axle module - Pull request #1115 at 270f22f: Do not activate ETS switch if no suitable cars are attached - Pull request #1120 at ba3c47f: Automatically Calculate Friction Values if Missing - Pull request #1121 at 91d2d26: Manually Override Articulation - Pull request #1124 at e241a0d: Built-in PBL2 brake controller - Pull request #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID. - Pull request #1143 at 36327c4: Status in Work Orders popup set too fast - Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger - Pull request #1155 at 40f8c34: fix for illegal characters in refeerence to Shape file - Pull request #1157 at 39cd994: Dynamic brake authorization by TCS - Pull request #1082 at 5845a1a: Allow variable water level in glass gauge - Pull request #1128 at 1d7643d: Particle Emitter Overhaul
16 parents 25b7bfb + a5be129 + e10390b + 9b80fac + ccc5c4d + 270f22f + ba3c47f + 91d2d26 + e241a0d + 8ae6bb7 + 36327c4 + 66dfd09 + 40f8c34 + 39cd994 + 5845a1a + 1d7643d commit 6792463

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

Source/Orts.Simulation/Simulation/Activity.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1399,11 +1399,7 @@ private Train matchesConsistNoOrder(List<string> wagonIdList)
13991399
}
14001400
if (nWagonListCars == wagonIdList.Count)
14011401
{
1402-
if (((wagonIdList[0] == trainItem.Cars[0].CarID) && (wagonIdList[wagonIdList.Count - 1] == trainItem.Cars[trainItem.Cars.Count - 1].CarID)) ||
1403-
((wagonIdList[0] == trainItem.Cars[trainItem.Cars.Count - 1].CarID) && (wagonIdList[wagonIdList.Count - 1] == trainItem.Cars[0].CarID)))
1404-
{
1405-
return trainItem;
1406-
}
1402+
return trainItem;
14071403
}
14081404
}
14091405
}

0 commit comments

Comments
 (0)