X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=model.cc;h=2aa94cfd84b4da470277f0ea81f6118d880e9f3e;hb=a635c5cdf004963a948dfb40e0fa27ce258bbccf;hp=0cc20794d61f1217163743de2f3147459d5d1466;hpb=db2c4ca161b4cba9e453431517af86798c0e9bdb;p=model-checker.git

diff --git a/model.cc b/model.cc
index 0cc2079..2aa94cf 100644
--- a/model.cc
+++ b/model.cc
@@ -3021,6 +3021,7 @@ uint64_t ModelChecker::switch_to_master(ModelAction *act)
 {
 	DBG();
 	Thread *old = thread_current();
+	scheduler->set_current_thread(NULL);
 	ASSERT(!old->get_pending());
 	old->set_pending(act);
 	if (Thread::swap(old, &system_context) < 0) {