Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 20:36:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

true reversion of scrips param

Browse source
This commit is contained in:
Wayne Chen 2018-12-05 08:16:54 -08:00
parent 4daa943510
commit 07599c02c8
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/Application.cpp
View file

@ -5279,7 +5279,12 @@ void Application::resumeAfterLoginDialogActionTaken() {
// this will force the model the look at the correct directory (weird order of operations issue) // this will force the model the look at the correct directory (weird order of operations issue)
scriptEngines->reloadLocalFiles(); scriptEngines->reloadLocalFiles();
scriptEngines->loadScripts(); if (!_defaultScriptsLocation.exists()) {
scriptEngines->loadDefaultScripts();
scriptEngines->defaultScriptsLocationOverridden(true);
} else {
scriptEngines->loadScripts();
}
} }
if (_firstRun.get()) { if (_firstRun.get()) {

5
libraries/script-engine/src/ScriptEngines.cpp
View file

@ -319,13 +319,10 @@ void ScriptEngines::loadScripts() {
// loads all saved scripts // loads all saved scripts
auto runningScripts = runningScriptsHandle.get(); auto runningScripts = runningScriptsHandle.get();
if (runningScripts.empty()) {
loadDefaultScripts();
return;
}
for (auto script : runningScripts) { for (auto script : runningScripts) {
auto string = script.toString(); auto string = script.toString();
qDebug() << string;
if (!string.isEmpty()) { if (!string.isEmpty()) {
loadScript(string); loadScript(string);
} }