diff --git a/launchers/win32/LauncherManager.cpp b/launchers/win32/LauncherManager.cpp index 0ab7bc6a4b..ed459bc48b 100644 --- a/launchers/win32/LauncherManager.cpp +++ b/launchers/win32/LauncherManager.cpp @@ -434,8 +434,8 @@ void LauncherManager::onMostRecentBuildsReceived(const CString& response, Launch addToLog(updatingMsg); _shouldUpdateLauncher = TRUE; _shouldDownloadLauncher = TRUE; - _willLogin = !isInstalled; - _willContinueUpdating = isInstalled && newInterfaceVersion; + _keepLoggingIn = !isInstalled; + _keepUpdating = isInstalled && newInterfaceVersion; } else { if (_updateLauncherAllowed) { addToLog(_T("Already running most recent build. Launching interface.exe")); @@ -616,9 +616,9 @@ void LauncherManager::onFileDownloaded(ProcessType type) { void LauncherManager::restartNewLauncher() { closeLog(); CLauncherDlg::DrawStep startScreen = CLauncherDlg::DrawStep::DrawProcessFinishUpdate; - if (_willContinueUpdating) { + if (_keepUpdating) { startScreen = CLauncherDlg::DrawStep::DrawProcessUpdate; - } else if (_willLogin) { + } else if (_keepLoggingIn) { startScreen = CLauncherDlg::DrawStep::DrawLoginLogin; } CStringW params; diff --git a/launchers/win32/LauncherManager.h b/launchers/win32/LauncherManager.h index d63c07316f..1246aff0bb 100644 --- a/launchers/win32/LauncherManager.h +++ b/launchers/win32/LauncherManager.h @@ -100,7 +100,7 @@ public: BOOL needsInstall() const { return _shouldInstall; } BOOL needsToWait() const { return _shouldWait; } BOOL needsRestartNewLauncher() const { return _shouldRestartNewLauncher; } - BOOL willContinueUpdating() const { return _willContinueUpdating; } + BOOL willContinueUpdating() const { return _keepUpdating; } CLauncherDlg::DrawStep getStartScreen() { return _startScreen; } void setDisplayName(const CString& displayName) { _displayName = displayName; } bool isLoggedIn() const { return _loggedIn; } @@ -154,8 +154,8 @@ private: BOOL _shouldDownloadLauncher { FALSE }; BOOL _updateLauncherAllowed { TRUE }; BOOL _shouldRestartNewLauncher { FALSE }; - BOOL _willLogin { FALSE }; - BOOL _willContinueUpdating { FALSE }; + BOOL _keepLoggingIn { FALSE }; + BOOL _keepUpdating { FALSE }; CLauncherDlg::DrawStep _startScreen; float _progressOffset { 0.0f }; float _progress { 0.0f };