diff options
| author | isanae <14251494+isanae@users.noreply.github.com> | 2020-08-15 20:53:42 -0400 |
|---|---|---|
| committer | isanae <14251494+isanae@users.noreply.github.com> | 2020-11-03 11:39:07 -0500 |
| commit | 003ef66d2ff8e83e864d362f152a6f87ae05cbc4 (patch) | |
| tree | 7c5b74c153e9fbd4468b629ebfd99620c9181d13 /src/settings.cpp | |
| parent | f7e9724eb1a817bdef372f87ebf96e9692db2bc9 (diff) | |
- 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
Diffstat (limited to 'src/settings.cpp')
| -rw-r--r-- | src/settings.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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 |