Fix bug for 3D-only cabs

openrails · Feb 14, 2023 · 00981a2 · 00981a2
1 parent f947f29
commit 00981a2
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -241,7 +241,6 @@ public override void HandleUserInput(ElapsedTime elapsedTime)
                 // Handle other cabcontrols
                 foreach (var kvp in external.CabControls)
                 {
-                    if (_CabRenderer == null) break;
                     if (!kvp.Value.Changed) continue;
                     float val = kvp.Value.Value;
                     switch (kvp.Key.Item1.Type)
@@ -291,7 +290,8 @@ public override void HandleUserInput(ElapsedTime elapsedTime)
                         // Other controls can hopefully be controlled faking mouse input
                         // TODO: refactor HandleUserInput() 
                         default:
-                            if (_CabRenderer.ControlMap.TryGetValue(kvp.Key, out var renderer) && renderer is CabViewDiscreteRenderer discrete)
+                            var cabRenderer = ThreeDimentionCabRenderer ?? _CabRenderer;
+                            if (cabRenderer != null && cabRenderer.ControlMap.TryGetValue(kvp.Key, out var renderer) && renderer is CabViewDiscreteRenderer discrete)
                             {
                                 var oldChanged = discrete.ChangedValue;
                                 discrete.ChangedValue = (oldval) => val;