Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update _scriptEngineHash to work with duplicate running scripts

Browse source
This commit is contained in:
Ryan Huffman 2014-06-24 11:46:35 -07:00
parent 108fa36d24
commit 652543cdca
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/src/Application.cpp
View file

@ -3524,11 +3524,8 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
QUrl scriptUrl(scriptName); QUrl scriptUrl(scriptName);
const QString& scriptURLString = scriptUrl.toString(); const QString& scriptURLString = scriptUrl.toString();
if (_scriptEnginesHash.contains(scriptURLString)) { if (_scriptEnginesHash.contains(scriptURLString)) {
if(loadScriptFromEditor && !_scriptEnginesHash[scriptURLString]->isFinished()) { if (loadScriptFromEditor && !_scriptEnginesHash[scriptURLString]->isFinished()) {
return _scriptEnginesHash[scriptURLString]; return _scriptEnginesHash[scriptURLString];
} else {
QMessageBox::warning(getWindow(), "Error Loading Script", scriptURLString + " is already running.");
return NULL;
} }
} }
@ -3545,7 +3542,7 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
return NULL; return NULL;
} }
_scriptEnginesHash.insert(scriptURLString, scriptEngine); _scriptEnginesHash.insertMulti(scriptURLString, scriptEngine);
_runningScriptsWidget->setRunningScripts(getRunningScripts()); _runningScriptsWidget->setRunningScripts(getRunningScripts());
} }
@ -3617,7 +3614,9 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript
} }
void Application::scriptFinished(const QString& scriptName) { void Application::scriptFinished(const QString& scriptName) {
if (_scriptEnginesHash.remove(scriptName)) { QHash<QString, ScriptEngine*>::iterator it = _scriptEnginesHash.find(scriptName);
if (it != _scriptEnginesHash.end()) {
_scriptEnginesHash.erase(it);
_runningScriptsWidget->scriptStopped(scriptName); _runningScriptsWidget->scriptStopped(scriptName);
_runningScriptsWidget->setRunningScripts(getRunningScripts()); _runningScriptsWidget->setRunningScripts(getRunningScripts());
bumpSettings(); bumpSettings();