CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reformat

Browse Source 
Signed-off-by: TheKodeToad <TheKodeToad@proton.me>
This commit is contained in:
TheKodeToad 2023-08-17 10:16:52 +01:00
parent 6da2e7d3f6
commit ffd8ed550f
No known key found for this signature in database
GPG Key ID: 5E39D70B4C93C38E
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
launcher/Application.cpp
View File

@ -1104,18 +1104,13 @@ bool Application::launch(InstancePtr instance,
MinecraftServerTargetPtr serverToJoin, MinecraftServerTargetPtr serverToJoin,
MinecraftAccountPtr accountToUse) MinecraftAccountPtr accountToUse)
{ {
if(m_updateRunning) if (m_updateRunning) {
{
qDebug() << "Cannot launch instances while an update is running. Please try again when updates are completed."; qDebug() << "Cannot launch instances while an update is running. Please try again when updates are completed.";
} } else if (instance->canLaunch()) {
else if(instance->canLaunch()) auto& extras = m_instanceExtras[instance->id()];
{
auto & extras = m_instanceExtras[instance->id()];
auto window = extras.window; auto window = extras.window;
if(window) if (window) {
{ if (!window->saveAll()) {
if(!window->saveAll())
{
return false; return false;
} }
} }

2
launcher/Application.h
View File

@ -187,7 +187,7 @@ class Application : public QApplication {
void clickedOnDock(); void clickedOnDock();
#endif #endif
public slots: public slots:
bool launch(InstancePtr instance, bool launch(InstancePtr instance,
bool online = true, bool online = true,
bool demo = false, bool demo = false,

2
launcher/ui/InstanceWindow.h
View File

@ -52,7 +52,7 @@ class PageContainer;
class InstanceWindow : public QMainWindow, public BasePageContainer { class InstanceWindow : public QMainWindow, public BasePageContainer {
Q_OBJECT Q_OBJECT
public: public:
explicit InstanceWindow(InstancePtr proc, QWidget* parent = 0); explicit InstanceWindow(InstancePtr proc, QWidget* parent = 0);
virtual ~InstanceWindow() = default; virtual ~InstanceWindow() = default;

2
launcher/ui/MainWindow.cpp
View File

@ -551,7 +551,7 @@ void MainWindow::updateMainToolBar()
void MainWindow::updateLaunchButton() void MainWindow::updateLaunchButton()
{ {
QMenu *launchMenu = ui->actionLaunchInstance->menu(); QMenu* launchMenu = ui->actionLaunchInstance->menu();
if (launchMenu) if (launchMenu)
launchMenu->clear(); launchMenu->clear();
else else