Rename wait and unload in best thread

Zach Pomerantz committed 10 years ago

Commit 2140dc71 parent 806d06b4 files · +13 −15Browse files

Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 4 files). Show all

Unified · Split

             // and stop. We can safely short circuit this because we know we're in the "quitting" process
             scriptEngine->disconnect(this);
-            // If this is an entity script, we need to unload any entities
-            scriptEngine->unloadAllEntityScripts();
             // Gracefully stop the engine's scripting thread
             scriptEngine->stop();
             // want any of the scripts final "scriptEnding()" or pending "update()" methods from accessing
             // any application state after we leave this stopAllScripts() method
             qCDebug(scriptengine) << "waiting on script:" << scriptName;
-            scriptEngine->wait();
+            scriptEngine->waitTillDoneRunning();
             qCDebug(scriptengine) << "done waiting on script:" << scriptName;
             scriptEngine->deleteLater();