diff --git a/TBF/BenchControl/Sequences/MainSeq.cs b/TBF/BenchControl/Sequences/MainSeq.cs index 94ef3100d..41cc0b870 100644 --- a/TBF/BenchControl/Sequences/MainSeq.cs +++ b/TBF/BenchControl/Sequences/MainSeq.cs @@ -978,14 +978,22 @@ namespace TBF.BenchControl.Sequences } StateMachine.LoadTestParams(test); - ProcessData.RegisterReaders = sensPath.RegisterReaders; - foreach (var rr in sensPath.RegisterReaders) - { - if ((rr is TestMethods.iPerlCommunication.iPerlHead.IperlHead) && (BenchInfo != null)) - { - (rr as TestMethods.iPerlCommunication.iPerlHead.IperlHead).BenchName = BenchInfo.TestBenchName; - } - } + + if ((sensPath != null) && (sensPath.RegisterReaders != null)) + { + ProcessData.RegisterReaders = sensPath.RegisterReaders; + foreach (var rr in sensPath.RegisterReaders) + { + if ((rr is TestMethods.iPerlCommunication.iPerlHead.IperlHead) && (BenchInfo != null)) + { + (rr as TestMethods.iPerlCommunication.iPerlHead.IperlHead).BenchName = BenchInfo.TestBenchName; + } + } + } + else + { + ProcessData.RegisterReaders = null; + } /// /// Execute one test (single repetition of a repeated test) @@ -1136,15 +1144,22 @@ namespace TBF.BenchControl.Sequences if (testMethod != null && testMethod.CanTest(StateMachine.Procedure.MetersKind)) { StateMachine.LoadTestParams(dfrrdData.Test); - ProcessData.RegisterReaders = sensPath.RegisterReaders; - foreach (var rr in sensPath.RegisterReaders) - { - if ((rr is TestMethods.iPerlCommunication.iPerlHead.IperlHead) && (BenchInfo != null)) - { - (rr as TestMethods.iPerlCommunication.iPerlHead.IperlHead).BenchName = BenchInfo.TestBenchName; - } - } + if ((sensPath != null) && (sensPath.RegisterReaders != null)) + { + ProcessData.RegisterReaders = sensPath.RegisterReaders; + foreach (var rr in sensPath.RegisterReaders) + { + if ((rr is TestMethods.iPerlCommunication.iPerlHead.IperlHead) && (BenchInfo != null)) + { + (rr as TestMethods.iPerlCommunication.iPerlHead.IperlHead).BenchName = BenchInfo.TestBenchName; + } + } + } + else + { + ProcessData.RegisterReaders = null; + } e = testMethod.Execute2ndPass(dfrrdData.Test, dfrrdData.RepetNr, dfrrdData.IntermediateData); @@ -1195,15 +1210,22 @@ namespace TBF.BenchControl.Sequences if (testMethod != null && testMethod.CanTest(StateMachine.Procedure.MetersKind)) { StateMachine.LoadTestParams(test); - ProcessData.RegisterReaders = sensPath.RegisterReaders; - foreach (var rr in sensPath.RegisterReaders) - { - if ((rr is TestMethods.iPerlCommunication.iPerlHead.IperlHead) && (BenchInfo != null)) - { - (rr as TestMethods.iPerlCommunication.iPerlHead.IperlHead).BenchName = BenchInfo.TestBenchName; - } - } + if ((sensPath != null) && (sensPath.RegisterReaders != null)) + { + ProcessData.RegisterReaders = sensPath.RegisterReaders; + foreach (var rr in sensPath.RegisterReaders) + { + if ((rr is TestMethods.iPerlCommunication.iPerlHead.IperlHead) && (BenchInfo != null)) + { + (rr as TestMethods.iPerlCommunication.iPerlHead.IperlHead).BenchName = BenchInfo.TestBenchName; + } + } + } + else + { + ProcessData.RegisterReaders = null; + } Event rsltTransBefore = Event.Done; Event rsltTransAfter = Event.Done; diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs index a08f2f3c4..358dbce10 100644 --- a/TBF/Properties/AssemblyInfo.cs +++ b/TBF/Properties/AssemblyInfo.cs @@ -29,5 +29,5 @@ using System.Runtime.InteropServices; // Build Number // Revision // -[assembly: AssemblyVersion("2.18.1367.0")] -[assembly: AssemblyFileVersion("2.18.1367.0")] +[assembly: AssemblyVersion("2.18.1374.0")] +[assembly: AssemblyFileVersion("2.18.1374.0")]