History

Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3"

This reverts commit 46f2ab73bccf6fa8669856534f0c20f96ee8c416.

matsukaze committed 12 years ago

Commit 1e1cc691 parent 46f2ab75 files · +38 −175Browse files

Showing the changes to interface/src/Application.cpp (1 of 5 files). Show all

Unified · Split

interface/src/Application.cpp+4−5
@@ -3483,10 +3483,8 @@ void Application::saveScripts() { · 3482 unmodified lines
3483}3483}
3484 3484
3485ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScriptFromEditor) {3485ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScriptFromEditor) {
3486 QUrl scriptUrl(scriptName);3486 if(loadScriptFromEditor && _scriptEnginesHash.contains(scriptName) && !_scriptEnginesHash[scriptName]->isFinished()){
3487 const QString& scriptURLString = scriptUrl.toString();3487 return _scriptEnginesHash[scriptName];
3488 if(loadScriptFromEditor && _scriptEnginesHash.contains(scriptURLString) && !_scriptEnginesHash[scriptURLString]->isFinished()){
3489 return _scriptEnginesHash[scriptURLString];
3490 }3488 }
3491 3489
3492 ScriptEngine* scriptEngine;3490 ScriptEngine* scriptEngine;
@@ -3494,8 +3492,9 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript · 1 unmodified line
3494 scriptEngine = new ScriptEngine(NO_SCRIPT, "", &_controllerScriptingInterface);3492 scriptEngine = new ScriptEngine(NO_SCRIPT, "", &_controllerScriptingInterface);
3495 } else {3493 } else {
3496 // start the script on a new thread...3494 // start the script on a new thread...
3495 QUrl scriptUrl(scriptName);
3497 scriptEngine = new ScriptEngine(scriptUrl, &_controllerScriptingInterface);3496 scriptEngine = new ScriptEngine(scriptUrl, &_controllerScriptingInterface);
3498 _scriptEnginesHash.insert(scriptURLString, scriptEngine);3497 _scriptEnginesHash.insert(scriptUrl.toString(), scriptEngine);
3499 3498
3500 if (!scriptEngine->hasScript()) {3499 if (!scriptEngine->hasScript()) {
3501 qDebug() << "Application::loadScript(), script failed to load...";3500 qDebug() << "Application::loadScript(), script failed to load...";