last ...

X121SMCEA/Signals/x-121.smc.xwz.signal.class.mq5

@@ -216,9 +216,9 @@ class XCX121SMCXWZSignalDetector : public XCBase
 
             //
             // Detect Zones and Boxes ...
-            hasWaitingZones = workingZone.DetectZone(
-                provider //
-            );
+            // hasWaitingZones = workingZone.DetectZone(
+            //     provider //
+            // );
 
             //
             hasWaitingBoxes = workingZone.HasWaitingBoxes();
@@ -281,18 +281,18 @@ class XCX121SMCXWZSignalDetector : public XCBase
         //
         // Detect Signal Box ...
 
-        //
-        bool isZoneActivated =
-            hasWorkingZone &&
-            hasWaitingZones &&
-            workingZone.IsZoneActivated(
-                activatedZoneIDX,
-                activatedFVGIDX,
-                signalBoxDir,
-                signalProvider,
-                provider,
-                zIndex //
-            );
+        // //
+        // bool isZoneActivated =
+        //     hasWorkingZone &&
+        //     hasWaitingZones &&
+        //     workingZone.IsZoneActivated(
+        //         activatedZoneIDX,
+        //         activatedFVGIDX,
+        //         signalBoxDir,
+        //         signalProvider,
+        //         provider,
+        //         zIndex //
+        //     );
 
         //
         // hasSignalBox =
@@ -306,6 +306,17 @@ class XCX121SMCXWZSignalDetector : public XCBase
         //         zIndex //
         //     );
 
+        //
+        hasSignalBox =
+            hasWorkingZone &&
+            workingZone.DetectSignalConditions(
+                signalBox,
+                signalBoxDir,
+                signalProvider,
+                provider,
+                zIndex //
+            );
+
         //
         if (hasSignalBox)
         {