fix merge bug

diff --git a/model.cc b/model.cc
index 3fb3758edac8e7a19c6575dfe8cb32d1cdaea416..c57ddeea13a28ce1ff1a1bad5a72a6ef9353830d 100644 (file)
--- a/model.cc
+++ b/model.cc
@@ -367,7 +367,7 @@ ModelAction * ModelChecker::initialize_curr_action(ModelAction *curr)
                return newcurr;
        }
 
-       newcurr = node_stack->explore_action(curr);
+       newcurr = node_stack->explore_action(curr, scheduler->get_enabled());
        if (newcurr) {
                /* First restore type and order in case of RMW operation */
                if (curr->is_rmwr())