4 files changed, 10 insertions, 7 deletions
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index f31e8325..b6c873cc 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -103,10 +103,6 @@ void ExternalResourcesPage::runningStateChanged(bool running)
         return;
     
     m_controlsEnabled = !running;
-    ui->actionAddItem->setEnabled(m_controlsEnabled);
-    ui->actionDisableItem->setEnabled(m_controlsEnabled);
-    ui->actionEnableItem->setEnabled(m_controlsEnabled);
-    ui->actionRemoveItem->setEnabled(m_controlsEnabled);
 }
 
 bool ExternalResourcesPage::shouldDisplay() const
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index 03910745..5da7f19f 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -274,6 +274,9 @@ void InstanceSettingsPage::applySettings()
     {
         m_settings->reset("JoinServerOnLaunchAddress");
     }
+
+    // FIXME: This should probably be called by a signal instead
+    m_instance->updateRuntimeContext();
 }
 
 void InstanceSettingsPage::loadSettings()
diff --git a/launcher/ui/pages/instance/LogPage.cpp b/launcher/ui/pages/instance/LogPage.cpp
index 3d9fb025..31c3e925 100644
--- a/launcher/ui/pages/instance/LogPage.cpp
+++ b/launcher/ui/pages/instance/LogPage.cpp
@@ -279,7 +279,7 @@ void LogPage::on_btnPaste_clicked()
         MessageLevel::Launcher,
         QString("%2: Log upload triggered at: %1").arg(
             QDateTime::currentDateTime().toString(Qt::RFC2822Date),
-            BuildConfig.LAUNCHER_NAME
+            BuildConfig.LAUNCHER_DISPLAYNAME
         )
     );
     auto url = GuiUtil::uploadPaste(m_model->toPlainText(), this);
@@ -289,7 +289,7 @@ void LogPage::on_btnPaste_clicked()
             MessageLevel::Launcher,
             QString("%2: Log uploaded to: %1").arg(
                 url,
-                BuildConfig.LAUNCHER_NAME
+                BuildConfig.LAUNCHER_DISPLAYNAME
             )
         );
     }
@@ -297,7 +297,7 @@ void LogPage::on_btnPaste_clicked()
     {
         m_model->append(
             MessageLevel::Error,
-            QString("%1: Log upload failed!").arg(BuildConfig.LAUNCHER_NAME)
+            QString("%1: Log upload failed!").arg(BuildConfig.LAUNCHER_DISPLAYNAME)
         );
     }
 }
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 28a874c2..f0106066 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -117,6 +117,10 @@ void ModFolderPage::runningStateChanged(bool running)
     ExternalResourcesPage::runningStateChanged(running);
     ui->actionDownloadItem->setEnabled(!running);
     ui->actionUpdateItem->setEnabled(!running);
+    ui->actionAddItem->setEnabled(!running);
+    ui->actionEnableItem->setEnabled(!running);
+    ui->actionDisableItem->setEnabled(!running);
+    ui->actionRemoveItem->setEnabled(!running);
 }
 
 bool ModFolderPage::shouldDisplay() const