Should fix issue #103.

This commit is contained in:
WrinklyNinja
2014-02-04 13:03:43 +00:00
parent 15dcda8d9a
commit 41988d931e
2 changed files with 5 additions and 2 deletions
+3
View File
@@ -444,6 +444,9 @@ namespace boss {
BOOST_LOG_TRIVIAL(trace) << "Calculating metadata difference for: " << name;
Plugin p(*this);
if (p.Priority() == plugin.Priority())
p.Priority(0); //So that non-zero priorities don't get written to the userlist if they're already in the masterlist.
//Compare this plugin against the given plugin.
set<File> files = plugin.LoadAfter();
set<File> filesDiff;
+2 -2
View File
@@ -301,8 +301,8 @@ void Editor::OnPluginSelect(wxListEvent& event) {
if (!currentPlugin.empty())
ApplyEdits(currentPlugin);
boss::Plugin plugin = GetMasterData(selectedPlugin);
plugin.Merge(GetUserData(selectedPlugin), true);
boss::Plugin plugin = GetUserData(selectedPlugin);
plugin.Merge(GetMasterData(selectedPlugin), true);
//Now fill editor fields with new plugin's info and update control states.
BOOST_LOG_TRIVIAL(debug) << "Filling editor fields with plugin info.";