aboutsummaryrefslogtreecommitdiff
path: root/launcher/LaunchController.cpp
diff options
context:
space:
mode:
authorRachel Powers <508861+Ryex@users.noreply.github.com>2023-07-13 20:05:16 -0700
committerGitHub <noreply@github.com>2023-07-13 20:05:16 -0700
commit520594e5296b09205e55bc018b1f759df5725e96 (patch)
tree07e334684062151c5fdf699e805d9326255a3dc3 /launcher/LaunchController.cpp
parent8d7dcdfc5b2a231a1304878e25929e6f4ff4e338 (diff)
parent94d4d12ee0a12572b2b661003f10cfbdda1b434a (diff)
downloadPrismLauncher-520594e5296b09205e55bc018b1f759df5725e96.tar.gz
PrismLauncher-520594e5296b09205e55bc018b1f759df5725e96.tar.bz2
PrismLauncher-520594e5296b09205e55bc018b1f759df5725e96.zip
Merge branch 'develop' into chore/add-compiler-warnings
Signed-off-by: Rachel Powers <508861+Ryex@users.noreply.github.com>
Diffstat (limited to 'launcher/LaunchController.cpp')
-rw-r--r--launcher/LaunchController.cpp4
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);