From 63eaf453e0de2087ce7d2a3c26edc7eac4bd1882 Mon Sep 17 00:00:00 2001
From: Tannin <sherb@gmx.net>
Date: Tue, 9 Feb 2016 20:05:41 +0100
Subject: portable setup is no longer offered if the directory isn't writable

---
 src/CMakeLists.txt      |  2 --
 src/instancemanager.cpp | 21 ++++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

(limited to 'src')

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fda85b76..a6434acf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -297,8 +297,6 @@ INCLUDE_DIRECTORIES(${project_path}/uibase/src
                     ${project_path}/game_gamebryo/src
                     ${project_path}/game_features/src)
 
-MESSAGE(STATUS ${project_path}/gameGamebryo/src)
-
 
 INCLUDE_DIRECTORIES(shared ${ZLIB_INCLUDE_DIRS})
 LINK_DIRECTORIES(${lib_path}
diff --git a/src/instancemanager.cpp b/src/instancemanager.cpp
index 48c12d42..d48d02d2 100644
--- a/src/instancemanager.cpp
+++ b/src/instancemanager.cpp
@@ -172,18 +172,21 @@ QString InstanceManager::determineDataPath()
 
     QStringList instanceList = instances();
 
-    qDebug("%d - %s", instanceList.size(), qPrintable(instanceList.join(";")));
-
     if (instanceList.size() == 0) {
-      switch (queryInstallMode()) {
-        case InstallationMode::PORTABLE: {
-          instanceId = QString();
-        } break;
-        case InstallationMode::REGULAR: {
-          instanceId = queryInstanceName();
-        } break;
+      if (QFileInfo(qApp->applicationDirPath()).isWritable()) {
+        switch (queryInstallMode()) {
+          case InstallationMode::PORTABLE: {
+            instanceId = QString();
+          } break;
+          case InstallationMode::REGULAR: {
+            instanceId = queryInstanceName();
+          } break;
+        }
+      } else {
+        instanceId = queryInstanceName();
       }
     } else {
+      // don't offer portable instance if we can't set one up.
       instanceId = chooseInstance(instanceList);
     }
   }
-- 
cgit v1.3.1