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 emtpy user metadata objects.

Browse Source 
Fixes #466.
This commit is contained in:
Oliver Hamlet
2015-07-17 14:48:00 +01:00
parent aa03d0585c
commit 9b8b7ef5f2
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/handler.cpp
+7 -12
View File
@@ -542,18 +542,13 @@ namespace loot {
else
newUserlistEntry = newUserlistEntry.NewMetadata(_lootState.CurrentGame().masterlist.FindPlugin(newUserlistEntry));
// Now replace existing userlist entry with the new one.
// Now erase any existing userlist entry.
if (!ulistPlugin.HasNameOnly()) {
BOOST_LOG_TRIVIAL(trace) << "Replacing existing userlist entry with new metadata.";
if (newUserlistEntry.HasNameOnly())
_lootState.CurrentGame().userlist.ErasePlugin(ulistPlugin);
else {
// Set members are static, so just erase and add the new data.
_lootState.CurrentGame().userlist.ErasePlugin(ulistPlugin);
_lootState.CurrentGame().userlist.AddPlugin(newUserlistEntry);
}
BOOST_LOG_TRIVIAL(trace) << "Erasing the existing userlist entry.";
_lootState.CurrentGame().userlist.ErasePlugin(ulistPlugin);
}
else {
// Add a new userlist entry if necessary.
if (!newUserlistEntry.HasNameOnly()) {
BOOST_LOG_TRIVIAL(trace) << "Adding new metadata to new userlist entry.";
_lootState.CurrentGame().userlist.AddPlugin(newUserlistEntry);
}
@@ -805,10 +800,10 @@ namespace loot {
//Evaluate any conditions in the global messages.
BOOST_LOG_TRIVIAL(debug) << "Evaluating global message conditions.";
list<Message> messages = parsingErrors;
messages.insert(messages.end(),
messages.insert(messages.end(),
_lootState.CurrentGame().masterlist.messages.begin(),
_lootState.CurrentGame().masterlist.messages.end());
messages.insert(messages.end(),
messages.insert(messages.end(),
_lootState.CurrentGame().userlist.messages.begin(),
_lootState.CurrentGame().userlist.messages.end());
try {