From 4b85db202eb3cd68f43cb7da0f0539b25deecb8f Mon Sep 17 00:00:00 2001
From: Milan Hanajik <milan.hanajik@xyleminc.com>
Date: Fri, 21 Oct 2022 08:28:02 +0200
Subject: [PATCH] Bug fix, ver. 3.3.1973

---
 TBF/Properties/AssemblyInfo.cs |  4 ++--
 TBF/Rig/Sequences/MainSeq.cs   | 11 ++++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 3da944bd9..74bf75903 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.3.1972.0")]
-[assembly: AssemblyFileVersion("3.3.1972.0")]
+[assembly: AssemblyVersion("3.3.1973.0")]
+[assembly: AssemblyFileVersion("3.3.1973.0")]
diff --git a/TBF/Rig/Sequences/MainSeq.cs b/TBF/Rig/Sequences/MainSeq.cs
index 41f8cc67e..c051e6131 100644
--- a/TBF/Rig/Sequences/MainSeq.cs
+++ b/TBF/Rig/Sequences/MainSeq.cs
@@ -214,18 +214,19 @@ namespace TBF.Rig.Sequences
 
                 ProcessData.SelectedProcedure = Program.MainWnd.SelectedProcedure;
                 ///
-                if (Program.MainWnd.SelectedProcedure.OrderInfo is Output.DB.SensusOracle.OrderDetails)
+                if (ProcessData.SelectedProcedure != null && ProcessData.SelectedProcedure.OrderInfo is Output.DB.SensusOracle.OrderDetails)
                 {
-                    ProcessData.OrderInfo = Program.MainWnd.SelectedProcedure.OrderInfo;
+                    ProcessData.OrderInfo = ProcessData.SelectedProcedure.OrderInfo;
                 }
-                else if (Program.MainWnd.SelectedProcedure.OrderInfo is SharedDatabase.Entities.OrderInfo && ProcessData.TracingDB != null)
+                else if (ProcessData.SelectedProcedure != null && ProcessData.SelectedProcedure.OrderInfo is SharedDatabase.Entities.OrderInfo &&
+                         ProcessData.TracingDB != null)
                 {
                     try
                     {
                         ISession session = ProcessData.TracingDB.SessionFactory.OpenSession();
                         var list = session.QueryOver<SharedDatabase.Entities.OrderInfo>()
-                                          .Where(x => (x.POName == Program.MainWnd.SelectedProcedure.OrderInfo.POName))
-                                          .List();
+                                            .Where(x => (x.POName == ProcessData.SelectedProcedure.OrderInfo.POName))
+                                            .List();
                         ProcessData.OrderInfo = (list.Count == 1) ? list[0] : null;
                         string workflow = (list.Count == 1) ? list[0].Workflow : null;
                         ProcessData.WorkflowSummary = SharedDatabase.WorkflowSummary.ReadFromDB(workflow, "test", session);