From 01fab1294296ca455cfab124dadfb8644e47b297 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Tue, 11 Jun 2019 09:18:20 -0700 Subject: [PATCH] fixing interface and laucnher script argument --- interface/src/Application.cpp | 2 +- launchers/darwin/src/Launcher.m | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 9ce2b0cb2e..0dea94c93e 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -5611,7 +5611,7 @@ void Application::resumeAfterLoginDialogActionTaken() { scriptEngines->reloadLocalFiles(); // if the --scripts command-line argument was used. - if (!_defaultScriptsLocation.exists() && (arguments().indexOf(QString("--").append(SCRIPTS_SWITCH))) != -1) { + if (_defaultScriptsLocation.exists() && (arguments().indexOf(QString("--").append(SCRIPTS_SWITCH))) != -1) { scriptEngines->loadDefaultScripts(); scriptEngines->defaultScriptsLocationOverridden(true); } else { diff --git a/launchers/darwin/src/Launcher.m b/launchers/darwin/src/Launcher.m index 3ab4379e7a..f586269864 100644 --- a/launchers/darwin/src/Launcher.m +++ b/launchers/darwin/src/Launcher.m @@ -343,14 +343,14 @@ static BOOL const DELETE_ZIP_FILES = TRUE; @"--tokens", userToken, @"--cache", contentPath, @"--displayName", displayName, - @"--script", scriptsPath, + @"--scripts", scriptsPath, @"--no-updater", @"--no-launcher", nil]; } else { arguments = [NSArray arrayWithObjects: @"--url" , domainUrl, @"--cache", contentPath, - @"--script", scriptsPath, + @"--scripts", scriptsPath, @"--no-updater", @"--no-launcher", nil]; }