Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-20 09:09:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Renamed variables

Browse source
This commit is contained in:
luiscuenca 2019-07-29 07:57:54 -07:00
parent 5e81f3684f
commit 8fde82dafc
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
launchers/win32/LauncherManager.cpp
View file

@ -434,8 +434,8 @@ void LauncherManager::onMostRecentBuildsReceived(const CString& response, Launch
addToLog(updatingMsg); addToLog(updatingMsg);
_shouldUpdateLauncher = TRUE; _shouldUpdateLauncher = TRUE;
_shouldDownloadLauncher = TRUE; _shouldDownloadLauncher = TRUE;
_willLogin = !isInstalled; _keepLoggingIn = !isInstalled;
_willContinueUpdating = isInstalled && newInterfaceVersion; _keepUpdating = isInstalled && newInterfaceVersion;
} else { } else {
if (_updateLauncherAllowed) { if (_updateLauncherAllowed) {
addToLog(_T("Already running most recent build. Launching interface.exe")); addToLog(_T("Already running most recent build. Launching interface.exe"));
@ -616,9 +616,9 @@ void LauncherManager::onFileDownloaded(ProcessType type) {
void LauncherManager::restartNewLauncher() { void LauncherManager::restartNewLauncher() {
closeLog(); closeLog();
CLauncherDlg::DrawStep startScreen = CLauncherDlg::DrawStep::DrawProcessFinishUpdate; CLauncherDlg::DrawStep startScreen = CLauncherDlg::DrawStep::DrawProcessFinishUpdate;
if (_willContinueUpdating) { if (_keepUpdating) {
startScreen = CLauncherDlg::DrawStep::DrawProcessUpdate; startScreen = CLauncherDlg::DrawStep::DrawProcessUpdate;
} else if (_willLogin) { } else if (_keepLoggingIn) {
startScreen = CLauncherDlg::DrawStep::DrawLoginLogin; startScreen = CLauncherDlg::DrawStep::DrawLoginLogin;
} }
CStringW params; CStringW params;

6
launchers/win32/LauncherManager.h
View file

@ -100,7 +100,7 @@ public:
BOOL needsInstall() const { return _shouldInstall; } BOOL needsInstall() const { return _shouldInstall; }
BOOL needsToWait() const { return _shouldWait; } BOOL needsToWait() const { return _shouldWait; }
BOOL needsRestartNewLauncher() const { return _shouldRestartNewLauncher; } BOOL needsRestartNewLauncher() const { return _shouldRestartNewLauncher; }
BOOL willContinueUpdating() const { return _willContinueUpdating; } BOOL willContinueUpdating() const { return _keepUpdating; }
CLauncherDlg::DrawStep getStartScreen() { return _startScreen; } CLauncherDlg::DrawStep getStartScreen() { return _startScreen; }
void setDisplayName(const CString& displayName) { _displayName = displayName; } void setDisplayName(const CString& displayName) { _displayName = displayName; }
bool isLoggedIn() const { return _loggedIn; } bool isLoggedIn() const { return _loggedIn; }
@ -154,8 +154,8 @@ private:
BOOL _shouldDownloadLauncher { FALSE }; BOOL _shouldDownloadLauncher { FALSE };
BOOL _updateLauncherAllowed { TRUE }; BOOL _updateLauncherAllowed { TRUE };
BOOL _shouldRestartNewLauncher { FALSE }; BOOL _shouldRestartNewLauncher { FALSE };
BOOL _willLogin { FALSE }; BOOL _keepLoggingIn { FALSE };
BOOL _willContinueUpdating { FALSE }; BOOL _keepUpdating { FALSE };
CLauncherDlg::DrawStep _startScreen; CLauncherDlg::DrawStep _startScreen;
float _progressOffset { 0.0f }; float _progressOffset { 0.0f };
float _progress { 0.0f }; float _progress { 0.0f };