Showing the changes to libraries/script-engine/src/ScriptEngines.cpp (1 of 4 files). Show all
Unified · Split
| @@ -158,9 +158,6 @@ void ScriptEngines::shutdownScripting() { · 157 unmodified lines | ||
| 158 | 158 | // and stop. We can safely short circuit this because we know we're in the "quitting" process |
| 159 | 159 | scriptEngine->disconnect(this); |
| 160 | 160 | |
| 161 | − // If this is an entity script, we need to unload any entities | |
| 162 | − scriptEngine->unloadAllEntityScripts(); | |
| 163 | − | |
| 164 | 161 | // Gracefully stop the engine's scripting thread |
| 165 | 162 | scriptEngine->stop(); |
| 166 | 163 | |
| @@ -168,7 +165,7 @@ void ScriptEngines::shutdownScripting() { · 1 unmodified line | ||
| 168 | 165 | // want any of the scripts final "scriptEnding()" or pending "update()" methods from accessing |
| 169 | 166 | // any application state after we leave this stopAllScripts() method |
| 170 | 167 | qCDebug(scriptengine) << "waiting on script:" << scriptName; |
| 171 | − scriptEngine->wait(); | |
| 168 | + scriptEngine->waitTillDoneRunning(); | |
| 172 | 169 | qCDebug(scriptengine) << "done waiting on script:" << scriptName; |
| 173 | 170 | |
| 174 | 171 | scriptEngine->deleteLater(); |