Updated fix with suggestion from Ryan

openrails · Jul 26, 2020 · ab92942 · ab92942
1 parent abd68c3
commit ab92942
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -2564,15 +2564,11 @@ public ThreeDimentionCabViewer(Viewer viewer, MSTSLocomotive car, MSTSLocomotive
                                 break;
                             default:
                                 //cvf file has no external wipers, left door, right door and mirrors key word
-                                if (locoViewer.ThreeDimentionCabRenderer.ControlMap.ContainsKey(key))
-                                {
-                                    style = locoViewer.ThreeDimentionCabRenderer.ControlMap[key];
-                                }
-                                else
+                                if (!locoViewer.ThreeDimentionCabRenderer.ControlMap.TryGetValue(key, out style))
                                 {
                                     var cvfBasePath = Path.Combine(Path.GetDirectoryName(Locomotive.WagFilePath), "CABVIEW");
                                     var cvfFilePath = Path.Combine(cvfBasePath, Locomotive.CVFFileName);
-                                    Trace.TraceWarning("Cabview control " + tmp[0].Trim() + " has not been defined in CVF file " + cvfFilePath);
+                                    Trace.TraceWarning($"Cabview control {tmp[0].Trim()} has not been defined in CVF file {cvfFilePath}");
                                 }
                                 break;
                         }