diff --git a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs index 6b1795fc0b..6914c4f399 100644 --- a/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs +++ b/src/MeoAsstGui/ViewModels/TaskQueueViewModel.cs @@ -1710,24 +1710,29 @@ namespace MeoAsstGui int hour = now.Hour; int minute = now.Minute; + bool timeLess(int lHour, int lMin, int rHour, int rMin) + { + if (lHour != rHour) + { + return lHour < rHour; + } + else + { + return lMin < rMin; + } + } + foreach (var plan in CustomInfrastPlanInfoList) { - bool hit = false; foreach (var period in plan.PeriodList) { - if (period.BeginHour <= hour && period.BeginMinute <= minute && - hour <= period.EndHour && minute <= period.EndMinute) + if (timeLess(period.BeginHour, period.BeginMinute, hour, minute) && + timeLess(hour, minute, period.EndHour, period.EndMinute)) { CustomInfrastPlanIndex = plan.Index; - hit = true; - break; + return; } } - - if (hit) - { - break; - } } }