Trade: HasOrderBetter: Fixes logic

EA31337 · Aug 11, 2021 · dc07cec · dc07cec
1 parent f2d6ff0
commit dc07cec
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Trade.mqh b/Trade.mqh
@@ -295,7 +295,7 @@ class Trade {
     OrderData _odata;
     double _price_curr = GetChart().GetOpenOffer(_cmd);
 
-    if (_order.IsSet()) {
+    if (_order.IsSet() && _order.Ptr().IsOpen()) {
       _odata = _order.Ptr().GetData();
       if (_odata.type == _cmd) {
         switch (_cmd) {
@@ -312,7 +312,7 @@ class Trade {
     if (!_result) {
       for (DictStructIterator<long, Ref<Order>> iter = orders_active.Begin(); iter.IsValid() && !_result; ++iter) {
         _order = iter.Value();
-        if (_order.IsSet()) {
+        if (_order.IsSet() && _order.Ptr().IsOpen()) {
           _odata = _order.Ptr().GetData();
           if (_odata.type == _cmd) {
             switch (_cmd) {