Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-05 21:22:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Retry self copy if the old launcher is still shutting down.

Browse source
This commit is contained in:
luiscuenca 2019-08-06 16:39:31 -07:00
parent f02b76fed0
commit ecd078f6d3
No known key found for this signature in database
GPG key ID: 2387ECD129A6961D
4 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
launchers/win32/LauncherApp.cpp
View file

@ -72,9 +72,7 @@ BOOL CLauncherApp::InitInstance() {
} else {
_manager.init(!noUpdate, continueAction);
}
if (!_manager.hasFailed() && !_manager.installLauncher()) {
return FALSE;
}
_manager.tryToInstallLauncher();
installFont(IDR_FONT_REGULAR);
installFont(IDR_FONT_BOLD);
CWinApp::InitInstance();

4
launchers/win32/LauncherDlg.cpp
View file

@ -656,7 +656,6 @@ BOOL CLauncherDlg::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
void CLauncherDlg::OnTimer(UINT_PTR nIDEvent) {
if (theApp._manager.hasFailed() && _drawStep != DrawStep::DrawError) {
theApp._manager.saveErrorLog();
prepareProcess(DrawStep::DrawError);
@ -757,6 +756,9 @@ void CLauncherDlg::OnTimer(UINT_PTR nIDEvent) {
_applicationWND = theApp._manager.launchApplication();
}
}
if (theApp._manager.needsToSelfInstall()) {
theApp._manager.tryToInstallLauncher(TRUE);
}
}
void CLauncherDlg::setVerticalElement(CWnd* element, int verticalOffset, int heightOffset, bool fromMainWindowBottom) {

37
launchers/win32/LauncherManager.cpp
View file

@ -108,7 +108,7 @@ void LauncherManager::saveErrorLog() {
}
}
BOOL LauncherManager::installLauncher() {
void LauncherManager::tryToInstallLauncher(BOOL retry) {
CString appPath;
BOOL result = getAndCreatePaths(PathType::Running_Path, appPath);
if (!result) {
@ -126,26 +126,49 @@ BOOL LauncherManager::installLauncher() {
if (!_shouldUninstall) {
// The installer is not running on the desired location and has to be installed
// Kill of running before self-copy
addToLog(_T("Installing Launcher."));
addToLog(_T("Trying to install launcher."));
int launcherPID = -1;
if (LauncherUtils::isProcessRunning(LAUNCHER_EXE_FILENAME, launcherPID)) {
if (!LauncherUtils::shutdownProcess(launcherPID, 0)) {
addToLog(_T("Error shutting down the Launcher"));
}
}
CopyFile(appPath, instalationPath, FALSE);
const int LAUNCHER_INSTALL_RETRYS = 10;
const int WAIT_BETWEEN_RETRYS_MS = 10;
int installTrys = retry ? LAUNCHER_INSTALL_RETRYS : 0;
for (int i = 0; i <= installTrys; i++) {
_retryLauncherInstall = !CopyFile(appPath, instalationPath, FALSE);
if (!_retryLauncherInstall) {
addToLog(_T("Launcher installed successfully."));
break;
} else if (i < installTrys) {
CString msg;
msg.Format(_T("Installing launcher try: %d"), i);
addToLog(msg);
Sleep(WAIT_BETWEEN_RETRYS_MS);
} else if (installTrys > 0) {
addToLog(_T("Error installing launcher."));
_retryLauncherInstall = false;
_hasFailed = true;
} else {
addToLog(_T("Old launcher is still running. Install could not be completed."));
}
}
}
} else if (_shouldUninstall) {
addToLog(_T("Launching Uninstall mode."));
CString tempPath;
if (getAndCreatePaths(PathType::Temp_Directory, tempPath)) {
tempPath += _T("\\HQ_uninstaller_tmp.exe");
CopyFile(instalationPath, tempPath, false);
LauncherUtils::launchApplication(tempPath, _T(" --uninstall"));
exit(0);
if (!CopyFile(instalationPath, tempPath, false)) {
addToLog(_T("Error copying uninstaller to tmp directory."));
_hasFailed = true;
} else {
LauncherUtils::launchApplication(tempPath, _T(" --uninstall"));
exit(0);
}
}
}
return TRUE;
}
BOOL LauncherManager::restartLauncher() {

4
launchers/win32/LauncherManager.h
View file

@ -92,7 +92,7 @@ public:
BOOL deleteShortcuts();
HWND launchApplication();
BOOL uninstallApplication();
BOOL installLauncher();
void tryToInstallLauncher(BOOL retry = FALSE);
BOOL restartLauncher();
// getters
@ -108,6 +108,7 @@ public:
BOOL needsInstall() const { return _shouldInstall; }
BOOL needsToWait() const { return _shouldWait; }
BOOL needsRestartNewLauncher() const { return _shouldRestartNewLauncher; }
BOOL needsToSelfInstall() const { return _retryLauncherInstall; }
BOOL willContinueUpdating() const { return _keepUpdating; }
ContinueActionOnStart getContinueAction() { return _continueAction; }
void setDisplayName(const CString& displayName) { _displayName = displayName; }
@ -164,6 +165,7 @@ private:
BOOL _shouldRestartNewLauncher { FALSE };
BOOL _keepLoggingIn { FALSE };
BOOL _keepUpdating { FALSE };
BOOL _retryLauncherInstall { FALSE };
ContinueActionOnStart _continueAction;
float _progressOffset { 0.0f };
float _progress { 0.0f };