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, ver. 3.1.1602

Browse Source
This commit is contained in:
Milan Hanajik
2021-04-08 14:30:25 +02:00
parent d02e06cb9a
commit d5544d3041
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
TBF/Properties/AssemblyInfo.cs
+2 -2
View File
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
// Build Number // Build Number
// Revision // Revision
// //
[assembly: AssemblyVersion("3.1.1601.0")] [assembly: AssemblyVersion("3.1.1602.0")]
[assembly: AssemblyFileVersion("3.1.1601.0")] [assembly: AssemblyFileVersion("3.1.1602.0")]
TBF/Rig/Sequences/MainSeqUtils.cs
+6 -6
View File
@@ -493,9 +493,9 @@ namespace TBF.Rig.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.Rig.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