From 4a261cac1a71b0817ed9693da3b16796ada8f348 Mon Sep 17 00:00:00 2001
From: Vance <40771709+vancez@users.noreply.github.com>
Date: Fri, 10 Jun 2022 10:25:13 +0800
Subject: [PATCH 1/2] fix: update toolbar when instance state changes

---
 launcher/ui/MainWindow.cpp | 11 +++++++++++
 launcher/ui/MainWindow.h   |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 7e152b96b..c5a4cafe3 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -2101,6 +2101,9 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
         selectionBad();
         return;
     }
+    if (m_selectedInstance) {
+        disconnect(m_selectedInstance.get(), &BaseInstance::runningStatusChanged, this, &MainWindow::on_InstanceState_changed);
+    }
     QString id = current.data(InstanceList::InstanceIDRole).toString();
     m_selectedInstance = APPLICATION->instances()->getInstanceById(id);
     if (m_selectedInstance)
@@ -2127,6 +2130,8 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
         updateToolsMenu();
 
         APPLICATION->settings()->set("SelectedInstance", m_selectedInstance->id());
+
+        connect(m_selectedInstance.get(), &BaseInstance::runningStatusChanged, this, &MainWindow::on_InstanceState_changed);
     }
     else
     {
@@ -2216,3 +2221,9 @@ void MainWindow::updateStatusCenter()
         m_statusCenter->setText(tr("Total playtime: %1").arg(Time::prettifyDuration(timePlayed)));
     }
 }
+
+void MainWindow::on_InstanceState_changed(bool running)
+{
+    auto current = view->selectionModel()->currentIndex();
+    instanceChanged(current, current);
+}
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index 2032acbaf..bd16246b1 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -192,6 +192,8 @@ private slots:
     void keyReleaseEvent(QKeyEvent *event) override;
 #endif
 
+    void on_InstanceState_changed(bool running);
+
 private:
     void retranslateUi();
 

From fa5b1d99786567a6a183513df6fdf63d1e667bc5 Mon Sep 17 00:00:00 2001
From: Vance <40771709+vancez@users.noreply.github.com>
Date: Fri, 10 Jun 2022 15:48:18 +0800
Subject: [PATCH 2/2] change slot name

---
 launcher/ui/MainWindow.cpp | 6 +++---
 launcher/ui/MainWindow.h   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index c5a4cafe3..0a5f20007 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -2102,7 +2102,7 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
         return;
     }
     if (m_selectedInstance) {
-        disconnect(m_selectedInstance.get(), &BaseInstance::runningStatusChanged, this, &MainWindow::on_InstanceState_changed);
+        disconnect(m_selectedInstance.get(), &BaseInstance::runningStatusChanged, this, &MainWindow::refreshCurrentInstance);
     }
     QString id = current.data(InstanceList::InstanceIDRole).toString();
     m_selectedInstance = APPLICATION->instances()->getInstanceById(id);
@@ -2131,7 +2131,7 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
 
         APPLICATION->settings()->set("SelectedInstance", m_selectedInstance->id());
 
-        connect(m_selectedInstance.get(), &BaseInstance::runningStatusChanged, this, &MainWindow::on_InstanceState_changed);
+        connect(m_selectedInstance.get(), &BaseInstance::runningStatusChanged, this, &MainWindow::refreshCurrentInstance);
     }
     else
     {
@@ -2222,7 +2222,7 @@ void MainWindow::updateStatusCenter()
     }
 }
 
-void MainWindow::on_InstanceState_changed(bool running)
+void MainWindow::refreshCurrentInstance(bool running)
 {
     auto current = view->selectionModel()->currentIndex();
     instanceChanged(current, current);
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index bd16246b1..61a75c450 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -192,7 +192,7 @@ private slots:
     void keyReleaseEvent(QKeyEvent *event) override;
 #endif
 
-    void on_InstanceState_changed(bool running);
+    void refreshCurrentInstance(bool running);
 
 private:
     void retranslateUi();