Automatic merge of T1.6-rc7-43-ge3d1d75f9 and 14 pull requests

- Pull request #1086 at e10390b: Add Settings Exporter tool (copy settings to INI, etc)
- Pull request #1091 at 2e06f85: Automatic speed control
- Pull request #1104 at 87cdd9f: 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 #1130 at 8ae6bb7: Fix F9 points to an incorrect car ID.
- Pull request #1143 at 1ad59d7: Status in Work Orders popup set too fast
- Pull request #1151 at 5e59187: fix: Do not allow non-ACE/DDS textures in content
- Pull request #1152 at 66dfd09: fix: Clean up multiple issues with data logger
- Pull request #1082 at 5845a1a: Allow variable water level in glass gauge
- Pull request #1081 at 689494b: Brake cuts power unification
- Pull request #1124 at fab5457: Built-in PBL2 brake controller
- Pull request #1128 at 278d8ff: Particle Emitter Overhaul

Author: openrails-bot

Source/Orts.Simulation/Simulation/Activity.cs

@@ -1325,13 +1325,13 @@ override public Boolean Triggered(Activity activity)
                     }
                     break;
                 case EventType.DropOffWagonsAtLocation:
-                    // Dropping off of wagons should only count once disconnected from player train.
-                    // A better name than DropOffWagonsAtLocation would be ArriveAtSidingWithWagons.
-                    // To recognize the dropping off of the cars before the event is activated, this method is used.
-                    if (atSiding(OriginalPlayerTrain.FrontTDBTraveller, OriginalPlayerTrain.RearTDBTraveller, this.SidingEnd1, this.SidingEnd2))
-                    {
                         consistTrain = matchesConsistNoOrder(ChangeWagonIdList);
-                        triggered = consistTrain != null;
+                    if (consistTrain != null)
+                    {
+                        if (atSiding(consistTrain.FrontTDBTraveller, consistTrain.RearTDBTraveller, this.SidingEnd1, this.SidingEnd2))
+                        {
+                            triggered = true;
+                        }
                     }
                     break;
                 case EventType.PickUpPassengers:
@@ -1392,10 +1392,10 @@ private Train matchesConsistNoOrder(List<string> wagonIdList)
                 {
                         nWagonListCars++;
                     }
-                    if (nWagonListCars == trainItem.Cars.Count)
-                    {
-                        return trainItem;
-                    }
+                }
+                if (nWagonListCars == trainItem.Cars.Count)
+                {
+                    return trainItem;
                 }
                 }