Merge pull request from wayne-chen/fixScriptsNotBeingSaved-78

MS20356: Running Scripts list doesn't persist between Interface restarts
This commit is contained in:
Jeff Clinton 2018-12-19 08:52:40 -08:00 committed by GitHub
commit c80b3dea52
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -5252,7 +5252,8 @@ void Application::resumeAfterLoginDialogActionTaken() {
// this will force the model the look at the correct directory (weird order of operations issue)
scriptEngines->reloadLocalFiles();
if (!_defaultScriptsLocation.exists()) {
// if the --scripts command-line argument was used.
if (!_defaultScriptsLocation.exists() && (arguments().indexOf(QString("--").append(SCRIPTS_SWITCH))) != -1) {
scriptEngines->loadDefaultScripts();
scriptEngines->defaultScriptsLocationOverridden(true);
} else {