diff --git a/Classes/x-saherelm.x121.setup.xea.mq5 b/Classes/x-saherelm.x121.setup.xea.mq5 index 256d3d19..1e2f2f59 100644 --- a/Classes/x-saherelm.x121.setup.xea.mq5 +++ b/Classes/x-saherelm.x121.setup.xea.mq5 @@ -5059,6 +5059,16 @@ private: return; } + // + // Check Delay Between Two Signals ... + bool isMarginPassed = IsMarginPassed(); + bool isDelayPassed = IsSignalDelayPassed(signal); + bool isNumberOfPositionsPassed = IsNumberOfPositionsPassed(); + bool canUseSignal = + isMarginPassed && + isDelayPassed && + isNumberOfPositionsPassed; + // XSignal signals[]; @@ -5086,11 +5096,7 @@ private: ; // - // Check Delay Between Two Signals ... - bool isDelayPassed = IsSignalDelayPassed(signal); - - // - if (isDelayPassed) + if (canUseSignal) { // AddRef( @@ -5134,34 +5140,6 @@ private: return; } - // - bool isMarginPassed = IsMarginPassed(); - if (!isMarginPassed) - { - // - string message = "No Margin For Execute Signals ..."; - - // - Alert(message); - - // - return; - } - - // - bool isNumberOfPositionsPassed = IsNumberOfPositionsPassed(); - if (!isNumberOfPositionsPassed) - { - // - string message = "Max Allowed Signals Reached ..."; - - // - Alert(message); - - // - return; - } - // // // Execute Supports ...