1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:23:53 +00:00

Merge pull request #2516 from Capostrophic/launcher

Launcher: Avoid Qt "opening user openmw.cfg twice" warning
This commit is contained in:
Andrei Kortunov 2019-09-11 10:29:52 +04:00 committed by GitHub
commit 6c006c9c87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -329,6 +329,7 @@ bool Launcher::MainDialog::setupGameSettings()
stream.setCodec(QTextCodec::codecForName("UTF-8"));
mGameSettings.readUserFile(stream);
file.close();
}
// Now the rest - priority: user > local > global
@ -353,8 +354,8 @@ bool Launcher::MainDialog::setupGameSettings()
stream.setCodec(QTextCodec::codecForName("UTF-8"));
mGameSettings.readFile(stream);
file.close();
}
file.close();
}
return true;