Linux: Set config directory to "~/.config/QMPlay2"

Keep backward compatibility Closes #352
zaps166 · Mar 10, 2021 · e8daa77 · e8daa77
1 parent 12befab
commit e8daa77
Showing 1 changed file with 15 additions and 3 deletions.
diff --git a/src/qmplay2/QMPlay2Core.cpp b/src/qmplay2/QMPlay2Core.cpp
@@ -29,6 +29,7 @@
 #include <Module.hpp>
 
 #include <QLoggingCategory>
+#include <QStandardPaths>
 #include <QApplication>
 #include <QLibraryInfo>
 #include <QTranslator>
@@ -44,7 +45,6 @@
     #include <powrprof.h>
 #elif defined Q_OS_MACOS
     #include <QOperatingSystemVersion>
-    #include <QStandardPaths>
 #elif !defined Q_OS_ANDROID
     #include <QProcess>
 #endif
@@ -212,15 +212,27 @@ void QMPlay2CoreClass::init(bool loadModules, bool modulesInSubdirs, const QStri
     langDir = shareDir + "lang/";
 
     if (Version::isPortable())
+    {
         settingsDir = QCoreApplication::applicationDirPath() + "/settings/";
+    }
     else
     {
 #if defined(Q_OS_WIN)
         settingsDir = QFileInfo(QSettings(QSettings::IniFormat, QSettings::UserScope, QString()).fileName()).absolutePath() + "/QMPlay2/";
 #elif defined(Q_OS_MACOS)
-        settingsDir = Functions::cleanPath(QStandardPaths::standardLocations(QStandardPaths::DataLocation).value(0, settingsDir));
+        settingsDir = Functions::cleanPath(QStandardPaths::standardLocations(QStandardPaths::AppDataLocation).value(0));
 #else
-        settingsDir = QDir::homePath() + "/.qmplay2/";
+        const QString configSettingsDir(QStandardPaths::standardLocations(QStandardPaths::ConfigLocation).value(0) + "/QMPlay2/");
+        const QString homeSettingsDir(QDir::homePath() + "/.qmplay2/");
+        if (QFileInfo(configSettingsDir).isDir() || !QFileInfo(homeSettingsDir).isDir())
+        {
+            settingsDir = configSettingsDir;
+        }
+        else
+        {
+            // Backward compatibility
+            settingsDir = homeSettingsDir;
+        }
 #endif
     }
     QDir(settingsDir).mkpath(".");