Sfoglia il codice sorgente

Fixed bug with scheduled events running every minute

Kenric Nugteren 1 settimana fa
parent
commit
65a6f5e5db
1 ha cambiato i file con 12 aggiunte e 4 eliminazioni
  1. 12 4
      prs.stores/Events/Event.cs

+ 12 - 4
prs.stores/Events/Event.cs

@@ -410,8 +410,8 @@ public static class EventUtils
                 {
                     return false;
                 }
-                var start = now - now.TimeOfDay + dayOfWeekSettings.StartTime;
-                var end = now - now.TimeOfDay + dayOfWeekSettings.EndTime;
+                var start = now.Date + dayOfWeekSettings.StartTime;
+                var end = now.Date + dayOfWeekSettings.EndTime;
                 if(ev.Properties.Period == SchedulePeriod.Day)
                 {
                     if(ev.Properties.LastExecution < start && now >= start && (now.Date - ev.Properties.LastExecution.Date).TotalDays >= ev.Properties.Frequency)
@@ -433,8 +433,12 @@ public static class EventUtils
                         if(nowIntervals > lastIntervals)
                         {
                             ev.Properties.LastExecution = start.AddHours(nowIntervals * ev.Properties.Frequency);
+                            return true;
+                        }
+                        else
+                        {
+                            return false;
                         }
-                        return true;
                     }
                     else
                     {
@@ -450,8 +454,12 @@ public static class EventUtils
                         if (nowIntervals > lastIntervals)
                         {
                             ev.Properties.LastExecution = start.AddMinutes(nowIntervals * ev.Properties.Frequency);
+                            return true;
+                        }
+                        else
+                        {
+                            return false;
                         }
-                        return true;
                     }
                     else
                     {