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

Don't store metadata list parsing errors internally.

Browse Source 
It doesn't really matter for the masterlist, but if the userlist is
edited and saved, the parsing error will be recorded and so displayed on
every load, even if it's no longer true.
This commit is contained in:
Oliver Hamlet
2015-07-16 17:42:52 +01:00
parent 6441f8685d
commit c6b84ff644
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/handler.cpp
+10 -4
View File
@@ -656,6 +656,7 @@ namespace loot {
installed.push_back(pos->second);
}
list<Message> parsingErrors;
if (isFirstLoad) {
//Parse masterlist, don't update it.
if (fs::exists(_lootState.CurrentGame().MasterlistPath())) {
@@ -665,7 +666,7 @@ namespace loot {
_lootState.CurrentGame().masterlist.Load(_lootState.CurrentGame().MasterlistPath());
}
catch (exception &e) {
_lootState.CurrentGame().masterlist.messages.push_back(Message(Message::error, (boost::format(loc::translate("An error occurred while parsing the masterlist: %1%")) % e.what()).str()));
parsingErrors.push_back(Message(Message::error, (boost::format(loc::translate("An error occurred while parsing the masterlist: %1%")) % e.what()).str()));
}
}
@@ -677,7 +678,7 @@ namespace loot {
_lootState.CurrentGame().userlist.Load(_lootState.CurrentGame().UserlistPath());
}
catch (exception &e) {
_lootState.CurrentGame().userlist.messages.push_back(Message(Message::error, (boost::format(loc::translate("An error occurred while parsing the userlist: %1%")) % e.what()).str()));
parsingErrors.push_back(Message(Message::error, (boost::format(loc::translate("An error occurred while parsing the userlist: %1%")) % e.what()).str()));
}
}
}
@@ -779,8 +780,13 @@ namespace loot {
//Evaluate any conditions in the global messages.
BOOST_LOG_TRIVIAL(debug) << "Evaluating global message conditions.";
list<Message> messages = _lootState.CurrentGame().masterlist.messages;
messages.insert(messages.end(), _lootState.CurrentGame().userlist.messages.begin(), _lootState.CurrentGame().userlist.messages.end());
list<Message> messages = parsingErrors;
messages.insert(messages.end(),
_lootState.CurrentGame().masterlist.messages.begin(),
_lootState.CurrentGame().masterlist.messages.end());
messages.insert(messages.end(),
_lootState.CurrentGame().userlist.messages.begin(),
_lootState.CurrentGame().userlist.messages.end());
try {
list<Message>::iterator it = messages.begin();
while (it != messages.end()) {