diff options
| author | TheKodeToad <TheKodeToad@proton.me> | 2023-08-17 10:16:52 +0100 |
|---|---|---|
| committer | TheKodeToad <TheKodeToad@proton.me> | 2023-08-17 18:53:32 +0100 |
| commit | ffd8ed550f05e1336afc6ddc424b6733256ecf02 (patch) | |
| tree | c59c7f681a7bb0470adae2284cd66d70e0bda510 | |
| parent | 6da2e7d3f6f06916e9d92578546b5d80474aaa5f (diff) | |
| download | PrismLauncher-ffd8ed550f05e1336afc6ddc424b6733256ecf02.tar.gz PrismLauncher-ffd8ed550f05e1336afc6ddc424b6733256ecf02.tar.bz2 PrismLauncher-ffd8ed550f05e1336afc6ddc424b6733256ecf02.zip | |
Reformat
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
| -rw-r--r-- | launcher/Application.cpp | 15 | ||||
| -rw-r--r-- | launcher/Application.h | 2 | ||||
| -rw-r--r-- | launcher/ui/InstanceWindow.h | 2 | ||||
| -rw-r--r-- | launcher/ui/MainWindow.cpp | 2 |
4 files changed, 8 insertions, 13 deletions
diff --git a/launcher/Application.cpp b/launcher/Application.cpp index c1bf7e5e..4da7629c 100644 --- a/launcher/Application.cpp +++ b/launcher/Application.cpp @@ -1104,18 +1104,13 @@ bool Application::launch(InstancePtr instance, MinecraftServerTargetPtr serverToJoin, MinecraftAccountPtr accountToUse) { - if(m_updateRunning) - { + if (m_updateRunning) { qDebug() << "Cannot launch instances while an update is running. Please try again when updates are completed."; - } - else if(instance->canLaunch()) - { - auto & extras = m_instanceExtras[instance->id()]; + } else if (instance->canLaunch()) { + auto& extras = m_instanceExtras[instance->id()]; auto window = extras.window; - if(window) - { - if(!window->saveAll()) - { + if (window) { + if (!window->saveAll()) { return false; } } diff --git a/launcher/Application.h b/launcher/Application.h index a09f46b5..8a85fd95 100644 --- a/launcher/Application.h +++ b/launcher/Application.h @@ -187,7 +187,7 @@ class Application : public QApplication { void clickedOnDock(); #endif -public slots: + public slots: bool launch(InstancePtr instance, bool online = true, bool demo = false, diff --git a/launcher/ui/InstanceWindow.h b/launcher/ui/InstanceWindow.h index a8a7559f..e5bc24d4 100644 --- a/launcher/ui/InstanceWindow.h +++ b/launcher/ui/InstanceWindow.h @@ -52,7 +52,7 @@ class PageContainer; class InstanceWindow : public QMainWindow, public BasePageContainer { Q_OBJECT -public: + public: explicit InstanceWindow(InstancePtr proc, QWidget* parent = 0); virtual ~InstanceWindow() = default; diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp index 48feea09..36a6e379 100644 --- a/launcher/ui/MainWindow.cpp +++ b/launcher/ui/MainWindow.cpp @@ -551,7 +551,7 @@ void MainWindow::updateMainToolBar() void MainWindow::updateLaunchButton() { - QMenu *launchMenu = ui->actionLaunchInstance->menu(); + QMenu* launchMenu = ui->actionLaunchInstance->menu(); if (launchMenu) launchMenu->clear(); else |