Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop12

Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.h b/launcher/ui/pages/instance/ExternalResourcesPage.h
index 6c0a12cb..d29be0fc 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.h
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.h
@@ -4,8 +4,8 @@
 #include <QSortFilterProxyModel>
 
 #include "Application.h"
-#include "settings/Setting.h"
 #include "minecraft/MinecraftInstance.h"
+#include "settings/Setting.h"
 #include "ui/pages/BasePage.h"
 
 class ResourceFolderModel;
@@ -52,7 +52,7 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
 
     virtual void addItem();
     void removeItem();
-    virtual void removeItems(const QItemSelection &selection);
+    virtual void removeItems(const QItemSelection& selection);
 
     virtual void enableItem();
     virtual void disableItem();
@@ -73,7 +73,5 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
     QString m_fileSelectionFilter;
     QString m_viewFilter;
 
-    bool m_controlsEnabled = true;
-
     std::shared_ptr<Setting> m_wide_bar_setting = nullptr;
 };