aboutsummaryrefslogtreecommitdiff
path: root/launcher/LaunchController.cpp
diff options
context:
space:
mode:
authorTheKodeToad <TheKodeToad@proton.me>2023-07-11 11:14:06 +0100
committerGitHub <noreply@github.com>2023-07-11 11:14:06 +0100
commit4c6929038159a29c437b30616daa0b2672531e4d (patch)
treeba99c0783670059b7818aa14d3720f7798081ed7 /launcher/LaunchController.cpp
parent64c591b234cec2519d8a04b32d4b6e85dcf204da (diff)
parent640aaa8c23d714ce17bc8e78754af6219abc6466 (diff)
downloadPrismLauncher-4c6929038159a29c437b30616daa0b2672531e4d.tar.gz
PrismLauncher-4c6929038159a29c437b30616daa0b2672531e4d.tar.bz2
PrismLauncher-4c6929038159a29c437b30616daa0b2672531e4d.zip
Merge branch 'develop' into better-component-installation
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
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);