fix: Fix where we store the QSettings ini file

OpenZWave · Jun 19, 2020 · adf3e38 · adf3e38
1 parent 22c9f68
commit adf3e38
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/ozwadmin-main/main.cpp b/ozwadmin-main/main.cpp
@@ -101,6 +101,14 @@ int main(int argc, char *argv[])
 
     parser.process(a);
 
+
+
+#ifdef Q_OS_UNIX
+    if (parser.isSet(userDir)) {
+        QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, parser.value(userDir).append("ozw-admin.ini"));
+        qCDebug(ozwadmin) << "Settings Path is at " << QSettings().fileName();
+    }
+#endif
     QSettings settings;
 
     QString dbPath, userPath;
@@ -240,7 +248,6 @@ int main(int argc, char *argv[])
     qCInfo(ozwadmin) << "DBPath: " << dbPath;
     qCInfo(ozwadmin) << "userPath: " << userPath;
 
-
     MainWindow w;
     w.show();
     if (parser.isSet(serialPort)) {

diff --git a/ozwadmin-main/ozwcore.cpp b/ozwadmin-main/ozwcore.cpp
@@ -43,6 +43,8 @@ QTOZWManager *OZWCore::getQTOZWManager() {
 SettingsManager::SettingsManager(QObject *parent) :
     QObject(parent)
 {
+    qCDebug(ozwadmin) << "Settings Path: " << m_settings.fileName();
+
     bool ok;
     int size = qEnvironmentVariableIntValue("QTRO_NODES_CACHE_SIZE", &ok);
     if (!ok) {
@@ -57,7 +59,6 @@ SettingsManager::SettingsManager(QObject *parent) :
 
     setLogBufferSize(logBufferSize());
     setRetriveLogBuffer(retriveLogBuffer());
-
 }
 SettingsManager::~SettingsManager() 
 {