GH-2592 Autoselect newly created instances

4 files changed, 12 insertions, 0 deletions

diff --git a/api/logic/InstanceList.cpp b/api/logic/InstanceList.cpp
index afbebc25..dc367e30 100644
--- a/api/logic/InstanceList.cpp
+++ b/api/logic/InstanceList.cpp
@@ -819,6 +819,7 @@ bool InstanceList::commitStagedInstance(const QString& path, const QString& inst
         instanceSet.insert(instID);
         m_groups.insert(groupName);
         emit instancesChanged();
+        emit instanceAdded(instID);
     }
     saveGroupList();
     return true;
diff --git a/api/logic/InstanceList.h b/api/logic/InstanceList.h
index 50b44738..5f92a924 100644
--- a/api/logic/InstanceList.h
+++ b/api/logic/InstanceList.h
@@ -129,6 +129,7 @@ public:
 signals:
     void dataIsInvalid();
     void instancesChanged();
+    void instanceAdded(QString instanceId);
     void groupsChanged(QSet<QString> groups);
 
 public slots:
diff --git a/application/MainWindow.cpp b/application/MainWindow.cpp
index bec57c0d..ca98130e 100644
--- a/application/MainWindow.cpp
+++ b/application/MainWindow.cpp
@@ -702,6 +702,9 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
     // model reset -> selection is invalid. All the instance pointers are wrong.
     connect(MMC->instances().get(), &InstanceList::dataIsInvalid, this, &MainWindow::selectionBad);
 
+    // handle newly added instances
+    connect(MMC->instances().get(), &InstanceList::instanceAdded, this, &MainWindow::instanceAdded);
+
     // When the global settings page closes, we want to know about it and update our state
     connect(MMC, &MultiMC::globalSettingsClosed, this, &MainWindow::globalSettingsClosed);
 
@@ -1836,6 +1839,11 @@ void MainWindow::instanceChanged(const QModelIndex &current, const QModelIndex &
     }
 }
 
+void MainWindow::instanceAdded(QString id)
+{
+    setSelectedInstanceById(id);
+}
+
 void MainWindow::instanceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
 {
     auto current = view->selectionModel()->currentIndex();
diff --git a/application/MainWindow.h b/application/MainWindow.h
index 7691d50e..ea5b9847 100644
--- a/application/MainWindow.h
+++ b/application/MainWindow.h
@@ -152,6 +152,8 @@ private slots:
 
     void instanceChanged(const QModelIndex &current, const QModelIndex &previous);
 
+    void instanceAdded(QString id);
+
     void instanceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
 
     void selectionBad();