From 1fc18075ff903edbee9e23de3dc3d1a01d1b5675 Mon Sep 17 00:00:00 2001
From: Pieter van der Kloet <pvdkloet@gmail.com>
Date: Thu, 28 Apr 2011 22:49:05 +0200
Subject: [PATCH] Modified config loading function to always read/write from
 userPath There is no need for default (global) settings yet

---
 apps/launcher/datafilespage.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/apps/launcher/datafilespage.cpp b/apps/launcher/datafilespage.cpp
index 1b98087e95..2add275cbd 100644
--- a/apps/launcher/datafilespage.cpp
+++ b/apps/launcher/datafilespage.cpp
@@ -188,21 +188,20 @@ void DataFilesPage::setupDataFiles()
 
 void DataFilesPage::setupConfig()
 {
-    QFile config("launcher.cfg");
+    QString config = "launcher.cfg";
+    QFile file(config);
 
-    if (config.exists())
-    {
-        qDebug() << "Using config file from current directory";
-        mLauncherConfig = new QSettings("launcher.cfg", QSettings::IniFormat);
-    } else {
-        QString path = QString::fromStdString(Files::getPath(Files::Path_ConfigGlobal,
-                                                                 "openmw",
-                                                                 "launcher.cfg"));
-        qDebug() << "Using global config file from " << path;
-        mLauncherConfig = new QSettings(path, QSettings::IniFormat);
+    if (!file.exists()) {
+        config = QString::fromStdString(Files::getPath(Files::Path_ConfigUser,
+                                                       "openmw", "launcher.cfg"));
     }
 
-    config.close();
+    file.setFileName(config); // Just for displaying information
+    qDebug() << "Using config file from " << file.fileName();
+    file.close();
+
+    // Open our config file
+    mLauncherConfig = new QSettings(config, QSettings::IniFormat);
 
     mLauncherConfig->beginGroup("Profiles");
     QStringList profiles = mLauncherConfig->childGroups();