Fix consists not honoring the locomotive preference (first bug caught…

… by testing!).
openrails · Jul 23, 2020 · d189ea9 · d189ea9
1 parent 0b66e51
commit d189ea9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/Orts.Formats.Msts/ConsistFile.cs b/Source/Orts.Formats.Msts/ConsistFile.cs
@@ -82,15 +82,15 @@ public ISet<PreferredLocomotive> GetReverseLocomotiveChoices(string basePath, ID
 
         public IEnumerable<WagonReference> GetForwardWagonList(string basePath, IDictionary<string, string> folders, PreferredLocomotive preference = null)
         {
-            if (GetLeadLocomotiveChoices(basePath, folders).FirstOrDefault().Equals(preference))
+            if (preference != null && !GetLeadLocomotiveChoices(basePath, folders).Contains(preference))
                 return new WagonReference[0] { };
             return Train.TrainCfg.WagonList
                 .Select((Wagon wagon) => new WagonReference(EngineOrWagonPath(basePath, wagon), wagon.Flip, wagon.UiD));
         }
 
         public IEnumerable<WagonReference> GetReverseWagonList(string basePath, IDictionary<string, string> folders, PreferredLocomotive preference = null)
         {
-            if (GetReverseLocomotiveChoices(basePath, folders).FirstOrDefault().Equals(preference))
+            if (preference != null && !GetReverseLocomotiveChoices(basePath, folders).Contains(preference))
                 return new WagonReference[0] { };
             return Train.TrainCfg.WagonList
                 .Select((Wagon wagon) => new WagonReference(EngineOrWagonPath(basePath, wagon), !wagon.Flip, wagon.UiD))