better tmp path determining in portable mode #14

QNapi · Aug 6, 2015 · 1670734 · 1670734
1 parent bb80af2
commit 1670734
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/qnapiconfig.cpp b/src/qnapiconfig.cpp
@@ -29,8 +29,9 @@ void QNapiConfig::reload()
     if(settings) delete settings;
 
     QString localQNapiIniPath = QCoreApplication::applicationDirPath() + QDir::separator() + "qnapi.ini";
+    isPortableMode = QFileInfo(localQNapiIniPath).exists();
 
-    if(QFileInfo(localQNapiIniPath).exists())
+    if(isPortableMode)
     {
         settings = new QSettings(localQNapiIniPath, QSettings::IniFormat);
     }
@@ -110,7 +111,13 @@ void QNapiConfig::setP7zipPath(const QString & path)
 
 QString QNapiConfig::tmpPath()
 {
-    return settings->value("qnapi/tmp_path", QDir::tempPath()).toString();
+    QString tmpPath = settings->value("qnapi/tmp_path", QDir::tempPath()).toString();
+    if(!QFileInfo(tmpPath).exists() || !QFileInfo(tmpPath).isWritable()) {
+        if(isPortableMode) {
+            tmpPath = QDir::tempPath();
+        }
+    }
+    return tmpPath;
 }
 
 void QNapiConfig::setTmpPath(const QString & path)

diff --git a/src/qnapiconfig.h b/src/qnapiconfig.h
@@ -146,6 +146,7 @@ class QNapiConfig
         ~QNapiConfig();
 
         QSettings *settings;
+        bool isPortableMode;
 
     friend QNapiConfig& GlobalConfig();
 };