From 003ef66d2ff8e83e864d362f152a6f87ae05cbc4 Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sat, 15 Aug 2020 20:53:42 -0400
Subject: - changed PathSettings::base() to use the ini's parent directory
 instead of the global "dataPath" property; this is always the same thing,
 unless another Settings object is created for a different instance than the
 active one, which happens in the instance manager dialog - instance manager
 dialog:    - select the active instance when opening    - instance deletion
 now handles custom paths from the ini    - started on instance conversions,
 not functional

---
 src/settings.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'src/settings.cpp')

diff --git a/src/settings.cpp b/src/settings.cpp
index a0758bd4..b286510d 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1545,8 +1545,10 @@ QString PathSettings::makeDefaultPath(const QString dirName)
 
 QString PathSettings::base() const
 {
+  const QString dataPath = QFileInfo(m_Settings.fileName()).dir().path();
+
   return QDir::fromNativeSeparators(get<QString>(m_Settings,
-    "Settings", "base_directory", qApp->property("dataPath").toString()));
+    "Settings", "base_directory", dataPath));
 }
 
 QString PathSettings::downloads(bool resolve) const
-- 
cgit v1.3.1