CC: fix crash bug http://www.elvastower.com/forums/index.php?/topic/3…

…6716-many-most-trains-seem-to-crash-latest-unstable-version/
openrails · Nov 19, 2022 · 6ca89da · 6ca89da
1 parent bc3a13b
commit 6ca89da
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs b/Source/Orts.Simulation/Simulation/RollingStocks/MSTSLocomotive.cs
@@ -5389,15 +5389,14 @@ public virtual float GetDataOf(CabViewControl cvc)
 
                 case CABViewControlTypes.THROTTLE:
                     {
-                        if (CruiseControl.SkipThrottleDisplay) break;
+                        if (CruiseControl != null && CruiseControl.SkipThrottleDisplay) break;
                         data = GetThrottleHandleValue(Train.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING ? ThrottlePercent / 100f : LocalThrottlePercent / 100f);
                         break;
                     }
                 case CABViewControlTypes.THROTTLE_DISPLAY:
                 case CABViewControlTypes.CPH_DISPLAY:
                     {
-                        if (CruiseControl != null)
-                            if (CruiseControl.SkipThrottleDisplay) break;
+                        if (CruiseControl != null && CruiseControl.SkipThrottleDisplay) break;
                         data = Train.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING? ThrottlePercent / 100f : LocalThrottlePercent / 100f;
                         break;
                     }