handle timestamp conflict case where block exists online but not offline

ryan2445 · ryan2445 · commit 65c7f169d54d · 2024-08-15T01:53:10.000Z
diff --git a/LibNoDaveConnectionLibrary/DataTypes/Blocks/Step7V5/S7Block.cs b/LibNoDaveConnectionLibrary/DataTypes/Blocks/Step7V5/S7Block.cs
@@ -224,9 +224,7 @@ public enum S7BlockAtributes: byte
         /// </summary>
         public static bool HasTimestampConflict(DateTime dt1, DateTime dt2)
         {
-            if (!dt1.Equals(DateTime.MinValue) &&
-                !dt2.Equals(DateTime.MinValue) &&
-                !dt1.Equals(dt2))
+            if (!dt1.Equals(dt2))
             {
                 return true;
             }

Original file line number	Diff line number	Diff line change
`@@ -224,9 +224,7 @@ public enum S7BlockAtributes: byte`
`224`	`224`	`/// </summary>`
`225`	`225`	`public static bool HasTimestampConflict(DateTime dt1, DateTime dt2)`
`226`	`226`	`{`
`227`		`- if (!dt1.Equals(DateTime.MinValue) &&`
`228`		`- !dt2.Equals(DateTime.MinValue) &&`
`229`		`- !dt1.Equals(dt2))`
	`227`	`+ if (!dt1.Equals(dt2))`
`230`	`228`	`{`
`231`	`229`	`return true;`
`232`	`230`	`}`