Merge pull request #478 from Csantucci/3dcab-fix-for-alert-colour-not-displayed

cjakeman · web-flow · commit 2fe1e5da78c1 · 2021-09-14T19:01:23.000+01:00
Bug fix for https://bugs.launchpad.net/or/+bug/1943307 In 3d cabs Alert colour not displayed
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -2997,11 +2997,11 @@ Material FindMaterial(bool Alert)
             CABViewControlTypes controltype = CVFR.GetControlType();
             Material material = null;
 
-            if (AceFile != "")
+            if (Alert) { imageName = "alert.ace"; }
+            else if (AceFile != "")
             {
                 imageName = AceFile;
             }
-            else if (Alert) { imageName = "alert.ace"; }
             else
             {
                 switch (controltype)

Original file line number	Diff line number	Diff line change
`@@ -2997,11 +2997,11 @@ Material FindMaterial(bool Alert)`
`2997`	`2997`	`CABViewControlTypes controltype = CVFR.GetControlType();`
`2998`	`2998`	`Material material = null;`
`2999`	`2999`
`3000`		`- if (AceFile != "")`
	`3000`	`+ if (Alert) { imageName = "alert.ace"; }`
	`3001`	`+ else if (AceFile != "")`
`3001`	`3002`	`{`
`3002`	`3003`	`imageName = AceFile;`
`3003`	`3004`	`}`
`3004`		`- else if (Alert) { imageName = "alert.ace"; }`
`3005`	`3005`	`else`
`3006`	`3006`	`{`
`3007`	`3007`	`switch (controltype)`