last ...

2024-06-12 09:45:57 +03:30
parent 6da0c05cdf
commit a34d471d6e
6 changed files with 690 additions and 37 deletions
@@ -1898,24 +1898,32 @@ struct X121SignalGenerator
        }

        //
-        bool hasLong =
-            !_allowLong
-                ? false
-                : HasLongConditions(
-                      conditions,
-                      pusher,
-                      provider //
-                  );
+        bool hasLong = false;
+        bool hasShort = false;

        //
-        bool hasShort =
-            !_allowShort
-                ? false
-                : HasShortConditions(
-                      conditions,
-                      pusher,
-                      provider //
-                  );
+        if (_allowLong)
+        {
+            //
+            hasLong =
+                HasLongConditions(
+                    conditions,
+                    pusher,
+                    provider //
+                );
+        }
+
+        //
+        if (_allowShort && !hasLong)
+        {
+            //
+            hasShort =
+                HasShortConditions(
+                    conditions,
+                    pusher,
+                    provider //
+                );
+        }

        //
        result = hasLong || hasShort;