Merge pull request #3 from pvdk/config

Changed the order of preference for the configuration files
This commit is contained in:
Lukasz Gromanowski 2012-02-10 12:50:58 -08:00
commit 4fae3bd7c6

View file

@ -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());
}