Merge pull request #733 from Sharpe49/fix/battery-switch-sound

twpol · web-flow · commit 611b0195b4f7 · 2022-11-27T21:44:23.000Z
Fixed battery switch sound being repeted
diff --git a/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/BatterySwitch.cs b/Source/Orts.Simulation/Simulation/RollingStocks/SubSystems/PowerSupplies/BatterySwitch.cs
@@ -235,47 +235,47 @@ public virtual void HandleEvent(PowerSupplyEvent evt)
             switch (evt)
             {
                 case PowerSupplyEvent.CloseBatterySwitch:
-                    if (Mode == ModeType.Switch)
+                    if (Mode == ModeType.Switch && !CommandSwitch)
                     {
                         CommandSwitch = true;
                         Wagon.SignalEvent(Event.BatterySwitchCommandOn);
                     }
                     break;
 
                 case PowerSupplyEvent.OpenBatterySwitch:
-                    if (Mode == ModeType.Switch)
+                    if (Mode == ModeType.Switch && CommandSwitch)
                     {
                         CommandSwitch = false;
                         Wagon.SignalEvent(Event.BatterySwitchCommandOff);
                     }
                     break;
 
                 case PowerSupplyEvent.CloseBatterySwitchButtonPressed:
-                    if (Mode == ModeType.PushButtons)
+                    if (Mode == ModeType.PushButtons && !CommandButtonOn)
                     {
                         CommandButtonOn = true;
                         Wagon.SignalEvent(Event.BatterySwitchCommandOn);
                     }
                     break;
 
                 case PowerSupplyEvent.CloseBatterySwitchButtonReleased:
-                    if (Mode == ModeType.PushButtons)
+                    if (Mode == ModeType.PushButtons && CommandButtonOn)
                     {
                         CommandButtonOn = false;
                         Wagon.SignalEvent(Event.BatterySwitchCommandOff);
                     }
                     break;
 
                 case PowerSupplyEvent.OpenBatterySwitchButtonPressed:
-                    if (Mode == ModeType.PushButtons)
+                    if (Mode == ModeType.PushButtons && !CommandButtonOff)
                     {
                         CommandButtonOff = true;
                         Wagon.SignalEvent(Event.BatterySwitchCommandOn);
                     }
                     break;
 
                 case PowerSupplyEvent.OpenBatterySwitchButtonReleased:
-                    if (Mode == ModeType.PushButtons)
+                    if (Mode == ModeType.PushButtons && CommandButtonOff)
                     {
                         CommandButtonOff = false;
                         Wagon.SignalEvent(Event.BatterySwitchCommandOff);

Original file line number	Diff line number	Diff line change
`@@ -235,47 +235,47 @@ public virtual void HandleEvent(PowerSupplyEvent evt)`
`235`	`235`	`switch (evt)`
`236`	`236`	`{`
`237`	`237`	`case PowerSupplyEvent.CloseBatterySwitch:`
`238`		`- if (Mode == ModeType.Switch)`
	`238`	`+ if (Mode == ModeType.Switch && !CommandSwitch)`
`239`	`239`	`{`
`240`	`240`	`CommandSwitch = true;`
`241`	`241`	`Wagon.SignalEvent(Event.BatterySwitchCommandOn);`
`242`	`242`	`}`
`243`	`243`	`break;`
`244`	`244`
`245`	`245`	`case PowerSupplyEvent.OpenBatterySwitch:`
`246`		`- if (Mode == ModeType.Switch)`
	`246`	`+ if (Mode == ModeType.Switch && CommandSwitch)`
`247`	`247`	`{`
`248`	`248`	`CommandSwitch = false;`
`249`	`249`	`Wagon.SignalEvent(Event.BatterySwitchCommandOff);`
`250`	`250`	`}`
`251`	`251`	`break;`
`252`	`252`
`253`	`253`	`case PowerSupplyEvent.CloseBatterySwitchButtonPressed:`
`254`		`- if (Mode == ModeType.PushButtons)`
	`254`	`+ if (Mode == ModeType.PushButtons && !CommandButtonOn)`
`255`	`255`	`{`
`256`	`256`	`CommandButtonOn = true;`
`257`	`257`	`Wagon.SignalEvent(Event.BatterySwitchCommandOn);`
`258`	`258`	`}`
`259`	`259`	`break;`
`260`	`260`
`261`	`261`	`case PowerSupplyEvent.CloseBatterySwitchButtonReleased:`
`262`		`- if (Mode == ModeType.PushButtons)`
	`262`	`+ if (Mode == ModeType.PushButtons && CommandButtonOn)`
`263`	`263`	`{`
`264`	`264`	`CommandButtonOn = false;`
`265`	`265`	`Wagon.SignalEvent(Event.BatterySwitchCommandOff);`
`266`	`266`	`}`
`267`	`267`	`break;`
`268`	`268`
`269`	`269`	`case PowerSupplyEvent.OpenBatterySwitchButtonPressed:`
`270`		`- if (Mode == ModeType.PushButtons)`
	`270`	`+ if (Mode == ModeType.PushButtons && !CommandButtonOff)`
`271`	`271`	`{`
`272`	`272`	`CommandButtonOff = true;`
`273`	`273`	`Wagon.SignalEvent(Event.BatterySwitchCommandOn);`
`274`	`274`	`}`
`275`	`275`	`break;`
`276`	`276`
`277`	`277`	`case PowerSupplyEvent.OpenBatterySwitchButtonReleased:`
`278`		`- if (Mode == ModeType.PushButtons)`
	`278`	`+ if (Mode == ModeType.PushButtons && CommandButtonOff)`
`279`	`279`	`{`
`280`	`280`	`CommandButtonOff = false;`
`281`	`281`	`Wagon.SignalEvent(Event.BatterySwitchCommandOff);`