From dc2ada2a4249917f538938298deb193ed1dd6bb9 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Fri, 6 Nov 2020 13:56:04 -0500
Subject: added ... to the "Delete Instance" button to make it less scary
 merged InstanceInfo into Instance, most of it was redundant added logging
 before deleting instance added Instance::readFromIni(), contains stuff that
 used to be in setup(), used by instance dialog replaced QDir with QString in
 a few places, I hate QDir

---
 src/main.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/main.cpp')

diff --git a/src/main.cpp b/src/main.cpp
index 7f0886f6..a2653685 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -662,17 +662,17 @@ int doOneRun(
   }
   else
   {
-    if (!currentInstance->directory().exists()) {
+    if (!QDir(currentInstance->directory()).exists()) {
       // the previously used instance doesn't exist anymore
 
       if (m.hasAnyInstances()) {
         criticalOnTop(QObject::tr(
           "Instance at '%1' not found. Select another instance.")
-          .arg(currentInstance->directory().absolutePath()));
+          .arg(currentInstance->directory()));
       } else {
         criticalOnTop(QObject::tr(
           "Instance at '%1' not found. You must create a new instance")
-            .arg(currentInstance->directory().absolutePath()));
+            .arg(currentInstance->directory()));
       }
 
       currentInstance = selectInstance();
@@ -682,7 +682,7 @@ int doOneRun(
     }
   }
 
-  const QString dataPath = currentInstance->directory().path();
+  const QString dataPath = currentInstance->directory();
   application.setProperty("dataPath", dataPath);
 
   setExceptionHandlers();
-- 
cgit v1.3.1