Bug fix for https://bugs.launchpad.net/or/+bug/1950578 Dyn Brake set up state not disappearing in cab

Csantucci · Csantucci · commit b2affac45986 · 2021-11-11T11:00:45.000+01:00
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs b/Source/Orts.Simulation/Simulation/RollingStocks/TrainCar.cs
@@ -502,7 +502,7 @@ public int GearboxGearIndex
             }
         }
 
-        public float LocalDynamicBrakePercent;
+        public float LocalDynamicBrakePercent = -1;
         public float DynamicBrakePercent
         {
             get
@@ -527,6 +527,8 @@ public float DynamicBrakePercent
                     Train.MUDynamicBrakePercent = value;
                 else
                     LocalDynamicBrakePercent = value;
+                if (Train != null && this == Train.LeadLocomotive)
+                    LocalDynamicBrakePercent = value;
             }
         }
         public Direction Direction
diff --git a/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs b/Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs
@@ -1937,7 +1937,10 @@ public int GetDrawIndex()
                     if (Locomotive.DynamicBrakeController != null)
                     {
                         if (dynBrakePercent == -1)
+                        {
+                            index = 0;
                             break;
+                        }
                         if (!Locomotive.HasSmoothStruc)
                         {
                             index = Locomotive.DynamicBrakeController != null ? Locomotive.DynamicBrakeController.CurrentNotch : 0;

Original file line number	Diff line number	Diff line change
`@@ -502,7 +502,7 @@ public int GearboxGearIndex`
`502`	`502`	`}`
`503`	`503`	`}`
`504`	`504`
`505`		`- public float LocalDynamicBrakePercent;`
	`505`	`+ public float LocalDynamicBrakePercent = -1;`
`506`	`506`	`public float DynamicBrakePercent`
`507`	`507`	`{`
`508`	`508`	`get`
`@@ -527,6 +527,8 @@ public float DynamicBrakePercent`
`527`	`527`	`Train.MUDynamicBrakePercent = value;`
`528`	`528`	`else`
`529`	`529`	`LocalDynamicBrakePercent = value;`
	`530`	`+ if (Train != null && this == Train.LeadLocomotive)`
	`531`	`+ LocalDynamicBrakePercent = value;`
`530`	`532`	`}`
`531`	`533`	`}`
`532`	`534`	`public Direction Direction`
Original file line number	Diff line number	Diff line change
`@@ -1937,7 +1937,10 @@ public int GetDrawIndex()`
`1937`	`1937`	`if (Locomotive.DynamicBrakeController != null)`
`1938`	`1938`	`{`
`1939`	`1939`	`if (dynBrakePercent == -1)`
	`1940`	`+ {`
	`1941`	`+ index = 0;`
`1940`	`1942`	`break;`
	`1943`	`+ }`
`1941`	`1944`	`if (!Locomotive.HasSmoothStruc)`
`1942`	`1945`	`{`
`1943`	`1946`	`index = Locomotive.DynamicBrakeController != null ? Locomotive.DynamicBrakeController.CurrentNotch : 0;`