loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed settings init again.

Browse Source 
The fix in 09135350a9 just overwrote the
existing settings file every time.
This commit is contained in:
WrinklyNinja
2014-08-17 09:42:22 +01:00
parent c7967338bb
commit 0c8a2fc748
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/app.cpp
+15 -4
View File
@@ -120,8 +120,8 @@ namespace loot {
string initError;
//Load settings.
if (!fs::exists(g_path_settings) || !AreSettingsValid(_settings)) {
BOOST_LOG_TRIVIAL(error) << "Settings file invalid, or doesn't exist, generating new file.";
if (!fs::exists(g_path_settings)) {
BOOST_LOG_TRIVIAL(error) << "Settings file doesn't exist, generating new file.";
try {
fs::create_directory(g_path_settings.parent_path());
GenerateDefaultSettingsFile(g_path_settings);
@@ -130,8 +130,7 @@ namespace loot {
initError = "Error: Could not create local app data LOOT folder.";
}
}
BOOST_LOG_TRIVIAL(info) << "Settings file found, parsing...";
BOOST_LOG_TRIVIAL(info) << "Parsing settings file.";
try {
loot::ifstream in(g_path_settings);
_settings = YAML::Load(in);
@@ -140,6 +139,18 @@ namespace loot {
catch (YAML::ParserException& e) {
initError = (format(translate("Error: Settings parsing failed. %1%")) % e.what()).str();
}
if (!AreSettingsValid(_settings)) {
BOOST_LOG_TRIVIAL(error) << "Settings file invalid, generating new file.";
GenerateDefaultSettingsFile(g_path_settings);
try {
loot::ifstream in(g_path_settings);
_settings = YAML::Load(in);
in.close();
}
catch (YAML::ParserException& e) {
initError = (format(translate("Error: Settings parsing failed. %1%")) % e.what()).str();
}
}
//Set up logging.
boost::log::add_file_log(