Merge pull request #2067 from ZappoMan/scriptreload

fix reload of scripts
This commit is contained in:
ZappoMan 2014-02-24 10:28:04 -08:00
commit 4fc5444628

View file

@ -4201,7 +4201,9 @@ void Application::reloadAllScripts() {
scriptAction->activate(QAction::Trigger);
qDebug() << "stopping script..." << scriptAction->text();
}
_activeScripts.clear();
// NOTE: we don't need to clear the _activeScripts list because that is handled on script shutdown.
foreach (QString scriptName, reloadList){
qDebug() << "reloading script..." << scriptName;
loadScript(scriptName);
@ -4209,7 +4211,7 @@ void Application::reloadAllScripts() {
}
void Application::removeScriptName(const QString& fileNameString) {
_activeScripts.removeOne(fileNameString);
_activeScripts.removeOne(fileNameString);
}
void Application::loadScript(const QString& fileNameString) {