Merge pull request #439 from Csantucci/Missing-null-check-fix

Sharpe49 · web-flow · commit 126e4402a22c · 2021-07-15T00:15:56.000+02:00
Bug fix for https://bugs.launchpad.net/or/+bug/1935997 Missing null check
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSWagonViewer.cs
@@ -747,7 +747,7 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)
                 TrainCarShape.XNAMatrices[p.iMatrix] = Car.VibrationInverseMatrix * m;
             }
 
-            if (MSTSWagon.Train.IsPlayerDriven && !Car.Simulator.Settings.SimpleControlPhysics)
+            if ((MSTSWagon.Train?.IsPlayerDriven ?? false) && !Car.Simulator.Settings.SimpleControlPhysics)
             {
                 UpdateCouplers(frame, elapsedTime);
             }

Original file line number	Diff line number	Diff line change
`@@ -747,7 +747,7 @@ private void UpdateAnimation(RenderFrame frame, ElapsedTime elapsedTime)`
`747`	`747`	`TrainCarShape.XNAMatrices[p.iMatrix] = Car.VibrationInverseMatrix * m;`
`748`	`748`	`}`
`749`	`749`
`750`		`- if (MSTSWagon.Train.IsPlayerDriven && !Car.Simulator.Settings.SimpleControlPhysics)`
	`750`	`+ if ((MSTSWagon.Train?.IsPlayerDriven ?? false) && !Car.Simulator.Settings.SimpleControlPhysics)`
`751`	`751`	`{`
`752`	`752`	`UpdateCouplers(frame, elapsedTime);`
`753`	`753`	`}`