4 files changed, 30 insertions, 9 deletions

diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index 69c20309..39fbe3e2 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -101,7 +101,7 @@ ExternalResourcesPage::ExternalResourcesPage(BaseInstance* instance, std::shared
 {
     ui->setupUi(this);
 
-    runningStateChanged(m_instance && m_instance->isRunning());
+    ExternalResourcesPage::runningStateChanged(m_instance && m_instance->isRunning());
 
     ui->actionsToolbar->insertSpacer(ui->actionViewConfigs);
 
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.h b/launcher/ui/pages/instance/ExternalResourcesPage.h
index 41237139..ff294678 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.h
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.h
@@ -46,7 +46,7 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
    protected slots:
     void itemActivated(const QModelIndex& index);
     void filterTextChanged(const QString& newContents);
-    void runningStateChanged(bool running);
+    virtual void runningStateChanged(bool running);
 
     virtual void addItem();
     virtual void removeItem();
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 14e1f1e5..1b2cde0c 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -84,18 +84,31 @@ ModFolderPage::ModFolderPage(BaseInstance* inst, std::shared_ptr<ModFolderModel>
         ui->actionsToolbar->insertActionAfter(ui->actionAddItem, ui->actionUpdateItem);
         connect(ui->actionUpdateItem, &QAction::triggered, this, &ModFolderPage::updateMods);
 
-        connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this,
-                [this] { ui->actionUpdateItem->setEnabled(ui->treeView->selectionModel()->hasSelection() || !m_model->empty()); });
+        auto check_allow_update = [this] {
+            return (!m_instance || !m_instance->isRunning()) &&
+                   (ui->treeView->selectionModel()->hasSelection() || !m_model->empty());
+        };
 
-        connect(mods.get(), &ModFolderModel::rowsInserted, this,
-                [this] { ui->actionUpdateItem->setEnabled(ui->treeView->selectionModel()->hasSelection() || !m_model->empty()); });
-                
-        connect(mods.get(), &ModFolderModel::updateFinished, this, [this, mods] {
-            ui->actionUpdateItem->setEnabled(ui->treeView->selectionModel()->hasSelection() || !m_model->empty());
+        connect(ui->treeView->selectionModel(), &QItemSelectionModel::selectionChanged, this, [this, check_allow_update] {
+            ui->actionUpdateItem->setEnabled(check_allow_update());
+        });
+
+        connect(mods.get(), &ModFolderModel::rowsInserted, this, [this, check_allow_update] {
+            ui->actionUpdateItem->setEnabled(check_allow_update());
+        });
+
+        connect(mods.get(), &ModFolderModel::rowsRemoved, this, [this, check_allow_update] {
+            ui->actionUpdateItem->setEnabled(check_allow_update());
+        });
+
+        connect(mods.get(), &ModFolderModel::updateFinished, this, [this, check_allow_update, mods] {
+            ui->actionUpdateItem->setEnabled(check_allow_update());
 
             // Prevent a weird crash when trying to open the mods page twice in a session o.O
             disconnect(mods.get(), &ModFolderModel::updateFinished, this, 0);
         });
+
+        ModFolderPage::runningStateChanged(m_instance && m_instance->isRunning());
     }
 }
 
@@ -103,6 +116,13 @@ CoreModFolderPage::CoreModFolderPage(BaseInstance* inst, std::shared_ptr<ModFold
     : ModFolderPage(inst, mods, parent)
 {}
 
+void ModFolderPage::runningStateChanged(bool running)
+{
+    ExternalResourcesPage::runningStateChanged(running);
+    ui->actionDownloadItem->setEnabled(!running);
+    ui->actionUpdateItem->setEnabled(!running);
+}
+
 bool ModFolderPage::shouldDisplay() const
 {
     return true;
diff --git a/launcher/ui/pages/instance/ModFolderPage.h b/launcher/ui/pages/instance/ModFolderPage.h
index 0a7fc9fa..93889707 100644
--- a/launcher/ui/pages/instance/ModFolderPage.h
+++ b/launcher/ui/pages/instance/ModFolderPage.h
@@ -53,6 +53,7 @@ class ModFolderPage : public ExternalResourcesPage {
     virtual QString helpPage() const override { return "Loader-mods"; }
 
     virtual bool shouldDisplay() const override;
+    void runningStateChanged(bool running) override;
 
    private slots:
     void installMods();