Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 09:04:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

allowing qApp to load overlay/load default scripts if runningscripts empty

Browse source
This commit is contained in:
Wayne Chen 2018-11-07 16:32:06 -08:00
parent dd1cf1be6c
commit f683a51ef5
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
interface/src/ui/LoginDialog.cpp
View file

@ -71,7 +71,6 @@ void LoginDialog::showWithSelection() {
tablet->initialScreen(TABLET_LOGIN_DIALOG_URL);
} else {
// let Application handle creating login dialog overlay.
qApp->checkReadyToCreateLoginDialogOverlay();
}
}

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

@ -320,6 +320,11 @@ void ScriptEngines::loadScripts() {
// loads all saved scripts
auto runningScripts = runningScriptsHandle.get();
if (runningScripts.empty()) {
loadDefaultScripts();
return;
}
for (auto script : runningScripts) {
auto string = script.toString();
if (!string.isEmpty()) {