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

Merge pull request #15732 from danteruiz/fix-script-argument

Browse source 
BUGZ-638: simplified UI must work correctly on clean install from launcher
This commit is contained in:
Shannon Romano 2019-06-11 10:47:58 -07:00 committed by GitHub
commit 7df036c197
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Application.cpp
View file

@ -5611,7 +5611,7 @@ void Application::resumeAfterLoginDialogActionTaken() {
scriptEngines->reloadLocalFiles(); scriptEngines->reloadLocalFiles();
// if the --scripts command-line argument was used. // 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->loadDefaultScripts();
scriptEngines->defaultScriptsLocationOverridden(true); scriptEngines->defaultScriptsLocationOverridden(true);
} else { } else {

4
launchers/darwin/src/Launcher.m
View file

@ -343,14 +343,14 @@ static BOOL const DELETE_ZIP_FILES = TRUE;
@"--tokens", userToken, @"--tokens", userToken,
@"--cache", contentPath, @"--cache", contentPath,
@"--displayName", displayName, @"--displayName", displayName,
@"--script", scriptsPath, @"--scripts", scriptsPath,
@"--no-updater", @"--no-updater",
@"--no-launcher", nil]; @"--no-launcher", nil];
} else { } else {
arguments = [NSArray arrayWithObjects: arguments = [NSArray arrayWithObjects:
@"--url" , domainUrl, @"--url" , domainUrl,
@"--cache", contentPath, @"--cache", contentPath,
@"--script", scriptsPath, @"--scripts", scriptsPath,
@"--no-updater", @"--no-updater",
@"--no-launcher", nil]; @"--no-launcher", nil];
} }