CC: fix crash bug http://www.elvastower.com/forums/index.php?/topic/36716-many-most-trains-seem-to-crash-latest-unstable-version/

Csantucci · Csantucci · commit 6ca89da0f7ed · 2022-11-19T18:48:01.000+01:00
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;
                     }

Original file line number	Diff line number	Diff line change
`@@ -5389,15 +5389,14 @@ public virtual float GetDataOf(CabViewControl cvc)`
`5389`	`5389`
`5390`	`5390`	`case CABViewControlTypes.THROTTLE:`
`5391`	`5391`	`{`
`5392`		`- if (CruiseControl.SkipThrottleDisplay) break;`
	`5392`	`+ if (CruiseControl != null && CruiseControl.SkipThrottleDisplay) break;`
`5393`	`5393`	`data = GetThrottleHandleValue(Train.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING ? ThrottlePercent / 100f : LocalThrottlePercent / 100f);`
`5394`	`5394`	`break;`
`5395`	`5395`	`}`
`5396`	`5396`	`case CABViewControlTypes.THROTTLE_DISPLAY:`
`5397`	`5397`	`case CABViewControlTypes.CPH_DISPLAY:`
`5398`	`5398`	`{`
`5399`		`- if (CruiseControl != null)`
`5400`		`- if (CruiseControl.SkipThrottleDisplay) break;`
	`5399`	`+ if (CruiseControl != null && CruiseControl.SkipThrottleDisplay) break;`
`5401`	`5400`	`data = Train.TrainType == Train.TRAINTYPE.AI_PLAYERHOSTING? ThrottlePercent / 100f : LocalThrottlePercent / 100f;`
`5402`	`5401`	`break;`
`5403`	`5402`	`}`