mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-03-31 14:36:39 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2516 from Capostrophic/launcher

Browse source 
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
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/launcher/maindialog.cpp
View file

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