Fix race condition

rgc99 · Mar 23, 2021 · 0d564af · 0d564af
1 parent 65c94fc
commit 0d564af
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/custom_components/irrigation_unlimited/irrigation_unlimited.py b/custom_components/irrigation_unlimited/irrigation_unlimited.py
@@ -694,7 +694,7 @@ def merge(
                 # the finish time of the last entry.
                 run = self.find_last_by_id(schedule.id)
                 if run is not None:
-                    next_time = run.end_time
+                    next_time = run.end_time + granularity_time()
                 else:
                     next_time = time
                 if next_time < last_date:
@@ -708,7 +708,7 @@ def merge(
 
             if len(dates) > 0:
                 ns = min(dates)
-                if ns < last_date:
+                if ns != end_of_time and ns < last_date:
                     # There might be overlapping schedules. Add them all.
                     for i, d in enumerate(dates):
                         if d == ns: