add null check to usedS7ConvertingOptions

ryan2445 · ryan2445 · commit 303cc9215ac9 · 2024-08-09T03:43:30.000Z
diff --git a/LibNoDaveConnectionLibrary/DataTypes/Blocks/Step7V5/S7DataBlock.cs b/LibNoDaveConnectionLibrary/DataTypes/Blocks/Step7V5/S7DataBlock.cs
@@ -53,7 +53,7 @@ public IDataRow Structure
         {
             get
             {
-                bool checkIFaceConflict = usedS7ConvertingOptions.CheckForInterfaceTimestampConflicts;
+                bool checkIFaceConflict = usedS7ConvertingOptions != null && usedS7ConvertingOptions.CheckForInterfaceTimestampConflicts;
 
                 if ((!checkIFaceConflict && StructureFromString != null) || (checkIFaceConflict && !HasInterfaceTimestampConflict))
                 {

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public IDataRow Structure`
`53`	`53`	`{`
`54`	`54`	`get`
`55`	`55`	`{`
`56`		`- bool checkIFaceConflict = usedS7ConvertingOptions.CheckForInterfaceTimestampConflicts;`
	`56`	`+ bool checkIFaceConflict = usedS7ConvertingOptions != null && usedS7ConvertingOptions.CheckForInterfaceTimestampConflicts;`
`57`	`57`
`58`	`58`	`if ((!checkIFaceConflict && StructureFromString != null) \|\| (checkIFaceConflict && !HasInterfaceTimestampConflict))`
`59`	`59`	`{`