From a7a02db13d0a61d3eaecce44fc45b5389aed7b25 Mon Sep 17 00:00:00 2001 From: Ilya Date: Mon, 10 Mar 2025 23:15:56 +0500 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D1=83=20?= =?UTF-8?q?=D0=B2=20=D0=BE=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BD=D0=B8=D0=B8?= =?UTF-8?q?=20=D0=B2=D1=85=D0=BE=D0=B6=D0=B4=D0=B5=D0=BD=D0=B8=20=D0=B2=20?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B8=D0=BE=D0=B4=20=D0=B2=20nowInTimePeriod?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/virtual/Math/Math.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/modules/virtual/Math/Math.cpp b/src/modules/virtual/Math/Math.cpp index d726d2dc..979031f6 100644 --- a/src/modules/virtual/Math/Math.cpp +++ b/src/modules/virtual/Math/Math.cpp @@ -37,9 +37,16 @@ private: int h2 = selectToMarker(endTime, ":").toInt(); int min2 = selectToMarkerLast(endTime, ":").toInt(); + int sumMin1 = h1 * 60 + min1; + int sumMin2 = h2 * 60 + min2; + int nowMinutes = _time_local.hour * 60 + _time_local.minute; - return nowMinutes >= h1 * 60 + min1 && nowMinutes <= h2 * 60 + min2; + if (sumMin1 <= sumMin2) { + return nowMinutes >= sumMin1 && nowMinutes <= sumMin2; + } else { + return nowMinutes >= sumMin1 && nowMinutes <= 24 * 60 || nowMinutes >= 0 && nowMinutes <= sumMin2; + } }