diff options
| author | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-08 01:27:30 -0700 |
|---|---|---|
| committer | Rachel Powers <508861+Ryex@users.noreply.github.com> | 2023-07-08 01:27:30 -0700 |
| commit | 7f138e353801d0dde7608f2900b78cbe48d9488d (patch) | |
| tree | 42d146bd6a4f2a9cf026e106aa3aa1e5aaa95642 /launcher/LaunchController.cpp | |
| parent | b8b8c8d4acab8c794555956fae699d5706e222f3 (diff) | |
| parent | 3211b265d75dc7e28b1608935396bce2ac4648dd (diff) | |
| download | PrismLauncher-7f138e353801d0dde7608f2900b78cbe48d9488d.tar.gz PrismLauncher-7f138e353801d0dde7608f2900b78cbe48d9488d.tar.bz2 PrismLauncher-7f138e353801d0dde7608f2900b78cbe48d9488d.zip | |
Merge branch 'develop' into ci/address-sanitiser_on_debug_builds
Diffstat (limited to 'launcher/LaunchController.cpp')
| -rw-r--r-- | launcher/LaunchController.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/launcher/LaunchController.cpp b/launcher/LaunchController.cpp index 070ee283..5d84b3bf 100644 --- a/launcher/LaunchController.cpp +++ b/launcher/LaunchController.cpp @@ -187,8 +187,8 @@ void LaunchController::login() { switch(m_accountToUse->accountState()) { case AccountState::Offline: { m_session->wants_online = false; - // NOTE: fallthrough is intentional } + /* fallthrough */ case AccountState::Online: { if(!m_session->wants_online) { // we ask the user for a player name @@ -267,8 +267,8 @@ void LaunchController::login() { // This means some sort of soft error that we can fix with a refresh ... so let's refresh. case AccountState::Unchecked: { m_accountToUse->refresh(); - // NOTE: fallthrough intentional } + /* fallthrough */ case AccountState::Working: { // refresh is in progress, we need to wait for it to finish to proceed. ProgressDialog progDialog(m_parentWidget); |