From 1d97d914f1de0404b5b4db1bfdeff35ed94ea422 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 3 Nov 2020 10:57:26 -0500
Subject: InstanceManager now returns new Instance struct instead of instance
 name moved most of the figuring out of instance parameters from
 InstanceManager to Instance, separated all the ui from it and put it in
 main.cpp added ways to show single pages in the create instance dialog so
 they can be used when info is missing

---
 src/instancemanagerdialog.cpp | 50 +++++++++++++++++++++++++++----------------
 1 file changed, 31 insertions(+), 19 deletions(-)

(limited to 'src/instancemanagerdialog.cpp')

diff --git a/src/instancemanagerdialog.cpp b/src/instancemanagerdialog.cpp
index 545b5c71..f662082f 100644
--- a/src/instancemanagerdialog.cpp
+++ b/src/instancemanagerdialog.cpp
@@ -6,6 +6,7 @@
 #include "selectiondialog.h"
 #include "plugincontainer.h"
 #include "shared/appconfig.h"
+#include "shared/util.h"
 #include <utility.h>
 #include <report.h>
 #include <iplugingame.h>
@@ -20,11 +21,6 @@ void openInstanceManager(PluginContainer& pc, QWidget* parent)
   dlg.exec();
 }
 
-QString makeIniFile(const QDir& dir)
-{
-  return dir.filePath(QString::fromStdWString(AppConfig::iniFileName()));
-}
-
 
 class InstanceInfo
 {
@@ -61,7 +57,7 @@ public:
   void setDir(const QDir& dir)
   {
     m_dir = dir;
-    m_settings.reset(new Settings(makeIniFile(dir)));
+    m_settings.reset(new Settings(InstanceManager::iniPath(dir)));
   }
 
   QString name() const
@@ -109,7 +105,7 @@ public:
 
   QString iniFile() const
   {
-    return makeIniFile(m_dir);
+    return InstanceManager::iniPath(m_dir);
   }
 
   QIcon icon(const PluginContainer& plugins) const
@@ -134,10 +130,13 @@ public:
   {
     auto& m = InstanceManager::instance();
 
-    if (m_portable && m.currentInstance() == "") {
-      return true;
-    } else if (m.currentInstance() == name()) {
-      return true;
+    if (auto i=m.currentInstance())
+    {
+      if (m_portable) {
+        return i->isPortable();
+      } else {
+        return (i->name() == name());
+      }
     }
 
     return false;
@@ -316,7 +315,7 @@ InstanceManagerDialog::~InstanceManagerDialog() = default;
 InstanceManagerDialog::InstanceManagerDialog(
   const PluginContainer& pc, QWidget *parent) :
     QDialog(parent), ui(new Ui::InstanceManagerDialog), m_pc(pc),
-    m_model(nullptr)
+    m_model(nullptr), m_restartOnSelect(true)
 {
   ui->setupUi(this);
 
@@ -449,14 +448,16 @@ void InstanceManagerDialog::selectActiveInstance()
 {
   const auto active = InstanceManager::instance().currentInstance();
 
-  for (std::size_t i=0; i<m_instances.size(); ++i) {
-    if (m_instances[i]->name() == active) {
-      select(i);
+  if (active) {
+    for (std::size_t i=0; i<m_instances.size(); ++i) {
+      if (m_instances[i]->name() == active->name()) {
+        select(i);
 
-      ui->list->scrollTo(
-        m_filter.mapFromSource(m_filter.sourceModel()->index(i, 0)));
+        ui->list->scrollTo(
+          m_filter.mapFromSource(m_filter.sourceModel()->index(i, 0)));
 
-      return;
+        return;
+      }
     }
   }
 
@@ -470,7 +471,13 @@ void InstanceManagerDialog::openSelectedInstance()
     return;
   }
 
-  InstanceManager::instance().switchToInstance(m_instances[i]->name());
+  InstanceManager::instance().setCurrentInstance(m_instances[i]->name());
+
+  if (m_restartOnSelect) {
+    ExitModOrganizer(Exit::Restart);
+  }
+
+  accept();
 }
 
 QString getInstanceName(
@@ -697,6 +704,11 @@ void InstanceManagerDialog::deleteInstance()
 }
 
 
+void InstanceManagerDialog::setRestartOnSelect(bool b)
+{
+  m_restartOnSelect = b;
+}
+
 bool InstanceManagerDialog::doDelete(const QStringList& files, bool recycle)
 {
   if (MOBase::shellDelete(files, recycle, this)) {
-- 
cgit v1.3.1