From 302a9b744d1f8edbae5cad910b0153f3c717bd2b Mon Sep 17 00:00:00 2001
From: Eran Mizrahi <erasmux@gmail.com>
Date: Mon, 18 Dec 2017 01:47:03 +0200
Subject: Ensure clearing currentInstance reg key when selecting portable
 install

---
 src/instancemanager.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'src/instancemanager.cpp')

diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp
index 1b0d0e5b..b1b85cc6 100644
--- a/src/instancemanager.cpp
+++ b/src/instancemanager.cpp
@@ -189,6 +189,7 @@ QString InstanceManager::determineDataPath()
 
   if (instanceId.isEmpty() || !QFileInfo::exists(dataPath)) {
     instanceId = chooseInstance(instances());
+    setCurrentInstance(instanceId);
     if (!instanceId.isEmpty()) {
       dataPath = QDir::fromNativeSeparators(
         QStandardPaths::writableLocation(QStandardPaths::DataLocation)
@@ -199,8 +200,6 @@ QString InstanceManager::determineDataPath()
   if (instanceId.isEmpty()) {
     return qApp->applicationDirPath();
   } else {
-    setCurrentInstance(instanceId);
-
     createDataPath(dataPath);
 
     return dataPath;
-- 
cgit v1.3.1