summaryrefslogtreecommitdiff
path: root/src/instancemanager.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/instancemanager.cpp')
-rw-r--r--src/instancemanager.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp
index 2c8d8fb3..b6798fa9 100644
--- a/src/instancemanager.cpp
+++ b/src/instancemanager.cpp
@@ -344,7 +344,7 @@ QString InstanceManager::portablePath()
return qApp->applicationDirPath();
}
-bool InstanceManager::portableInstall() const
+bool InstanceManager::portableInstanceExists() const
{
return QFile::exists(qApp->applicationDirPath() + "/" +
QString::fromStdWString(AppConfig::iniFileName()));
@@ -357,7 +357,6 @@ bool InstanceManager::portableInstallIsLocked() const
QString::fromStdWString(AppConfig::portableLockFileName()));
}
-
bool InstanceManager::allowedToChangeInstance() const
{
return !portableInstallIsLocked();
@@ -388,7 +387,7 @@ QString InstanceManager::determineDataPath()
{
instanceId.clear();
}
- if (instanceId.isEmpty() && !m_Reset && (m_overrideInstance || portableInstall()))
+ if (instanceId.isEmpty() && !m_Reset && (m_overrideInstance || portableInstanceExists()))
{
// startup, apparently using portable mode before
return qApp->applicationDirPath();