Merge pull request #3 from pvdk/config

Changed the order of preference for the configuration files
zinnschlag · Feb 10, 2012 · 4fae3bd · 4fae3bd
2 parents b004e24 + eea8773
commit 4fae3bd
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/apps/launcher/maindialog.cpp b/apps/launcher/maindialog.cpp
@@ -164,15 +164,15 @@ void MainDialog::createPages()
         dataDirs = readConfig(file.fileName());
     }
 
-    // User location
-    file.setFileName(QString::fromStdString((mCfgMgr.getUserPath()/"openmw.cfg").string()));
+    // Local location
+    file.setFileName("./openmw.cfg");
+
     if (file.exists()) {
         dataDirs = readConfig(file.fileName());
     }
 
-    // Local location
-    file.setFileName("./openmw.cfg");
-
+    // User location
+    file.setFileName(QString::fromStdString((mCfgMgr.getUserPath()/"openmw.cfg").string()));
     if (file.exists()) {
         dataDirs = readConfig(file.fileName());
     }