Merge pull request #15733 from luiscuenca/addLocalScripts

Load simplifiedUI using the windows launcher
This commit is contained in:
Shannon Romano 2019-06-11 12:11:31 -07:00 committed by GitHub
commit acdc5e718d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 1302 additions and 1299 deletions

View file

@ -223,6 +223,8 @@ BOOL LauncherManager::launchApplication(const CString& tokensJSON) {
LauncherManager::getAndCreatePaths(PathType::Interface_Directory, installDir);
CString interfaceExe = installDir + _T("\\interface.exe");
CString params1 = _T("--url \"") + _domainURL + ("\" ");
CString scriptsURL = installDir + _T("\\scripts\\simplifiedUI");
CString params2 = _T("--scripts \"") + scriptsURL + ("\" ");
CString cacheDir;
LauncherManager::getAndCreatePaths(PathType::Content_Directory, cacheDir);
CString params3 = _T("--cache \"") + cacheDir + ("\" ");
@ -230,7 +232,8 @@ BOOL LauncherManager::launchApplication(const CString& tokensJSON) {
CString parsedTokens = tokensJSON;
parsedTokens.Replace(_T("\""), _T("\\\""));
CString params5 = !tokensJSON.IsEmpty() ? _T("--tokens \"") + parsedTokens + ("\"") : _T("");
CString params = params1 + params3 + params4 + params5 + EXTRA_PARAMETERS;
CString params = params1 + params2 + params3 + params4 + params5 + EXTRA_PARAMETERS;
auto rs = ShellExecute(NULL, L"open", interfaceExe, params, NULL, SW_SHOW);
return (rs != NULL);
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB