michal/tbf
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MainSeqUtils : Prevent crash when draining tanks at the end.

Browse Source
This commit is contained in:
Milan Hanajik 2021-04-08 13:52:05 +02:00
parent d8fc4a4c36
commit 46489224cf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TBF/BenchControl/Sequences/MainSeqUtils.cs
View File

@ -493,9 +493,9 @@ namespace TBF.BenchControl.Sequences
} }
/// Tank emptying valves states /// Tank emptying valves states
bool draining1 = (StateMachine.DrainValve1 != null); bool draining1 = (StateMachine.DrainValve1 != null && StateMachine.Tank1 != null);
bool draining2 = (StateMachine.DrainValve2 != null); bool draining2 = (StateMachine.DrainValve2 != null && StateMachine.Tank2 != null);
bool draining3 = (StateMachine.DrainValve3 != null); bool draining3 = (StateMachine.DrainValve3 != null && StateMachine.Tank3 != null);
int drainingStartTime = StateMachine.Time; int drainingStartTime = StateMachine.Time;
@ -517,9 +517,9 @@ namespace TBF.BenchControl.Sequences
.EnterState(); .EnterState();
while (StateMachine.WaitRunDevsRunOps().Contains(Event.Busy)) { } while (StateMachine.WaitRunDevsRunOps().Contains(Event.Busy)) { }
if (draining1 && StateMachine.Tank1.IsEmpty()) draining1 = false; if (draining1 && StateMachine.Tank1 != null && StateMachine.Tank1.IsEmpty()) draining1 = false;
if (draining2 && StateMachine.Tank2.IsEmpty()) draining2 = false; if (draining2 && StateMachine.Tank2 != null && StateMachine.Tank2.IsEmpty()) draining2 = false;
if (draining3 && StateMachine.Tank3.IsEmpty()) draining3 = false; if (draining3 && StateMachine.Tank3 != null && StateMachine.Tank3.IsEmpty()) draining3 = false;
} }
/// Close all drain valves /// Close all drain valves