Make requested changes

Signed-off-by: TheKodeToad <TheKodeToad@proton.me>

launcher/ui/widgets/JavaSettingsWidget.cpp

@@ -36,21 +36,20 @@
  */
 
 #include "JavaSettingsWidget.h"
-#include <Application.h>
-#include <BuildConfig.h>
-#include <JavaCommon.h>
-#include <settings/Setting.h>
-#include <ui/java/InstallJavaDialog.h>
 
-#include <FileSystem.h>
-#include <java/JavaInstallList.h>
-#include <java/JavaUtils.h>
-#include <sys.h>
-#include <ui/dialogs/CustomMessageBox.h>
-#include <ui/dialogs/VersionSelectDialog.h>
 #include <QFileDialog>
 #include <QFileInfo>
-#include <memory>
+#include "Application.h"
+#include "BuildConfig.h"
+#include "FileSystem.h"
+#include "JavaCommon.h"
+#include "java/JavaInstallList.h"
+#include "java/JavaUtils.h"
+#include "settings/Setting.h"
+#include "sys.h"
+#include "ui/dialogs/CustomMessageBox.h"
+#include "ui/dialogs/VersionSelectDialog.h"
+#include "ui/java/InstallJavaDialog.h"
 
 #include "ui_JavaSettingsWidget.h"
 

launcher/ui/widgets/JavaSettingsWidget.h

@@ -36,9 +36,9 @@
 
 #pragma once
 
-#include <BaseInstance.h>
-#include <JavaCommon.h>
 #include <QWidget>
+#include "BaseInstance.h"
+#include "JavaCommon.h"
 
 namespace Ui {
 class JavaSettingsWidget;
@@ -48,6 +48,7 @@ class JavaSettingsWidget : public QWidget {
     Q_OBJECT
 
    public:
+    explicit JavaSettingsWidget(QWidget* parent = nullptr) : JavaSettingsWidget(nullptr, nullptr) {}
     explicit JavaSettingsWidget(InstancePtr instance, QWidget* parent = nullptr);
     ~JavaSettingsWidget() override;
 

launcher/ui/widgets/MinecraftSettingsWidget.cpp

@@ -50,13 +50,11 @@ MinecraftSettingsWidget::MinecraftSettingsWidget(MinecraftInstancePtr instance,
     m_ui->setupUi(this);
 
     if (m_instance == nullptr) {
-        for (int i = 0; i < m_ui->settingsTabs->count(); ++i) {
+        for (int i = m_ui->settingsTabs->count() - 1; i >= 0; --i) {
             const QString name = m_ui->settingsTabs->widget(i)->objectName();
 
-            if (name == "javaPage" || name == "launchPage") {
+            if (name == "javaPage" || name == "launchPage")
                 m_ui->settingsTabs->removeTab(i);
-                --i;
-            }
         }
 
         m_ui->openGlobalSettingsButton->setVisible(false);