From 41988d931e9dd33c8a44f43fc7b2eaf68c66a3e8 Mon Sep 17 00:00:00 2001
From: WrinklyNinja <wrinklyninja1@gmail.com>
Date: Tue, 4 Feb 2014 13:03:43 +0000
Subject: [PATCH] Should fix issue #103.

---
 src/backend/metadata.cpp | 3 +++
 src/gui/editor.cpp       | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/backend/metadata.cpp b/src/backend/metadata.cpp
index a57f510d..990f01fe 100644
--- a/src/backend/metadata.cpp
+++ b/src/backend/metadata.cpp
@@ -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;
diff --git a/src/gui/editor.cpp b/src/gui/editor.cpp
index 0e55878d..14503069 100644
--- a/src/gui/editor.cpp
+++ b/src/gui/editor.cpp
@@ -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.";