mirror of
https://github.com/overte-org/overte.git
synced 2025-04-23 02:53:32 +02:00
true reversion of scrips param
This commit is contained in:
parent
4daa943510
commit
07599c02c8
2 changed files with 7 additions and 5 deletions
|
@ -5279,7 +5279,12 @@ void Application::resumeAfterLoginDialogActionTaken() {
|
|||
// this will force the model the look at the correct directory (weird order of operations issue)
|
||||
scriptEngines->reloadLocalFiles();
|
||||
|
||||
scriptEngines->loadScripts();
|
||||
if (!_defaultScriptsLocation.exists()) {
|
||||
scriptEngines->loadDefaultScripts();
|
||||
scriptEngines->defaultScriptsLocationOverridden(true);
|
||||
} else {
|
||||
scriptEngines->loadScripts();
|
||||
}
|
||||
}
|
||||
|
||||
if (_firstRun.get()) {
|
||||
|
|
|
@ -319,13 +319,10 @@ void ScriptEngines::loadScripts() {
|
|||
|
||||
// loads all saved scripts
|
||||
auto runningScripts = runningScriptsHandle.get();
|
||||
if (runningScripts.empty()) {
|
||||
loadDefaultScripts();
|
||||
return;
|
||||
}
|
||||
|
||||
for (auto script : runningScripts) {
|
||||
auto string = script.toString();
|
||||
qDebug() << string;
|
||||
if (!string.isEmpty()) {
|
||||
loadScript(string);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue