From a4747a1ecc9f4fe56700c64933cc3c6cebd04734 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Tue, 3 Nov 2020 12:10:41 -0500
Subject: show create instance dialog on startup if there are no instances

---
 src/createinstancedialog.cpp | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/createinstancedialog.cpp')

diff --git a/src/createinstancedialog.cpp b/src/createinstancedialog.cpp
index d2846367..c976ee13 100644
--- a/src/createinstancedialog.cpp
+++ b/src/createinstancedialog.cpp
@@ -333,11 +333,17 @@ void CreateInstanceDialog::finish()
 
     if (ui->launch->isChecked()) {
       InstanceManager::instance().setCurrentInstance(ci.instanceName);
-      ExitModOrganizer(Exit::Restart);
+
+      if (m_settings) {
+        // don't restart without settings, it happens on startup when there are
+        // no instances
+        ExitModOrganizer(Exit::Restart);
+      }
+
       m_switching = true;
-    } else {
-      accept();
     }
+
+    accept();
   }
   catch(Failed&)
   {
-- 
cgit v1.3.1