Merge pull request #906 from Csantucci/fix-3Dcab-only-crash

Csantucci · web-flow · commit abb8eb9a4be4 · 2024-01-05T11:49:03.000+01:00
Bug fix for https://bugs.launchpad.net/or/+bug/2047299 Crash loading a 3Dcab-only loco
diff --git a/Source/RunActivity/Viewer3D/Viewer.cs b/Source/RunActivity/Viewer3D/Viewer.cs
@@ -140,7 +140,7 @@ public class Viewer
         /// </summary>
         public void ActivateCabCamera()
         {
-            if (Settings.Use3DCab && ThreeDimCabCamera.IsAvailable)
+            if ((Settings.Use3DCab || !CabCamera.IsAvailable) && ThreeDimCabCamera.IsAvailable)
                 ThreeDimCabCamera.Activate();
             else
                 CabCamera.Activate();

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public class Viewer`
`140`	`140`	`/// </summary>`
`141`	`141`	`public void ActivateCabCamera()`
`142`	`142`	`{`
`143`		`- if (Settings.Use3DCab && ThreeDimCabCamera.IsAvailable)`
	`143`	`+ if ((Settings.Use3DCab \|\| !CabCamera.IsAvailable) && ThreeDimCabCamera.IsAvailable)`
`144`	`144`	`ThreeDimCabCamera.Activate();`
`145`	`145`	`else`
`146`	`146`	`CabCamera.Activate();`