From 3dcbd3dafbd0ba1e34210ab2944dafa1ddbfb5c8 Mon Sep 17 00:00:00 2001
From: biver <batata@mail.ru>
Date: Wed, 5 Jan 2022 16:26:53 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=B2=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D1=81=D1=80=D0=B0=D0=B2=D0=BD=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=BD=D0=B5=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA?=
 =?UTF-8?q?=D0=BE=20=D1=81=20=D0=BA=D0=BE=D0=BD=D1=81=D1=82=D0=B0=D0=BD?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BC=D0=B8,=20=D0=BD=D0=BE=20=D0=B8=20=D1=81?=
 =?UTF-8?q?=D0=BE=20=D0=B7=D0=BD=D0=B0=D1=87=D0=B5=D0=BD=D0=B8=D1=8F=D0=BC?=
 =?UTF-8?q?=D0=B8=20=D0=B8=D0=B7=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=BD=D1=8B=D1=85=20=D0=B2=20=D1=80=D0=B0=D0=BC=D0=BA?=
 =?UTF-8?q?=D0=B0=D1=85=20=D1=81=D1=86=D0=B5=D0=BD=D0=B0=D1=80=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/Class/ScenarioClass3.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/include/Class/ScenarioClass3.h b/include/Class/ScenarioClass3.h
index ca09d7e1..5d9cf0ae 100644
--- a/include/Class/ScenarioClass3.h
+++ b/include/Class/ScenarioClass3.h
@@ -211,6 +211,10 @@ class Scenario {
         setEventSign = selectFromMarkerToMarker(condition, " ", 1);
         setEventValue = selectFromMarkerToMarker(condition, " ", 2);
 
+        String tmpStr;
+        tmpStr = getValue(setEventValue);
+        if (tmpStr != "no value") setEventValue = tmpStr;
+        
         if (!isDigitDotCommaStr(setEventValue)) {
             if (isTimeStr(incommingEventValue)) {
                 int hhLStr = selectToMarker(incommingEventValue, ":").toInt();
@@ -220,8 +224,6 @@ class Scenario {
 
                 incommingEventValue = hhLStr*60 + mmLStr;
                 setEventValue = hhRStr*60 + mmRStr;
-            } else {
-                setEventValue = getValue(setEventValue);
             }
         }
     }