From 6ae27224b0dcc860b882bebff3149828d874c832 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Thu, 12 Nov 2020 03:15:14 -0500
Subject: fixed a bunch of instance and command line stuff - clear instance
 manager overrides when restarting, or switching instances after starting MO
 with moshortcut://instance: won't do anything - clear overrides when the last
 selected instance can't be opened; MO would keep trying to open shortcuts
 even after selecting a different instance - command line was cleared too
 early, before the first run, so shortcuts were broken - the instance manager
 dialog can be opened without an instance loaded if the last selected instance
 doesn't exist, createNew() would throw because it tried to access the global
 Settings - fixed some problems with parts of MO wanting to restart and others
 expecting flow to continue - fixed create instance dialog using settings
 pointer to decide whether to restart; it restarts when it's the first created
 instance, which is not always the case even if the settings are null, so just
 check whether there are instances

---
 src/instancemanagerdialog.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/instancemanagerdialog.cpp')

diff --git a/src/instancemanagerdialog.cpp b/src/instancemanagerdialog.cpp
index ff76e121..2497d8d8 100644
--- a/src/instancemanagerdialog.cpp
+++ b/src/instancemanagerdialog.cpp
@@ -580,13 +580,17 @@ void InstanceManagerDialog::onSelection()
 
 void InstanceManagerDialog::createNew()
 {
-  CreateInstanceDialog dlg(m_pc, &Settings::instance(), this);
+  // there might not be settings available; the dialog can be shown when the
+  // last selected instance doesn't exist anymore
+  CreateInstanceDialog dlg(m_pc, Settings::maybeInstance(), this);
+
   if (dlg.exec() != QDialog::Accepted) {
     return;
   }
 
   if (dlg.switching()) {
     // restarting MO
+    accept();
     return;
   }
 
-- 
cgit v1.3.1