From 6d1013c90a09dad581871341bb1be53c64ef03da Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Sat, 20 Dec 2014 19:56:22 +0000
Subject: [PATCH] Revert "Fixed masterlist and userlist messages not shown."

This reverts commit 98073c355e9406ff3a2730da7dd25cffad71f965.
---
 src/backend/graph.cpp | 10 +++-------
 src/gui/main.cpp      | 22 +++++++++-------------
 2 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/src/backend/graph.cpp b/src/backend/graph.cpp
index 08627e48..bd9f49ec 100644
--- a/src/backend/graph.cpp
+++ b/src/backend/graph.cpp
@@ -105,18 +105,15 @@ namespace loot {
         std::list<vertex_t> sortedVertices;
         boost::topological_sort(graph, std::front_inserter(sortedVertices), boost::vertex_index_map(v_index_map));
 
-        /* Sorting now evaluates conditions inside the graph, so existing plugins list is missing
-        data present in the graph, so we need to swap the two lists. */
         BOOST_LOG_TRIVIAL(info) << "Calculated order: ";
-        plugins.clear();
+        list<string> tempPlugins;
         for (const auto &vertex: sortedVertices) {
             BOOST_LOG_TRIVIAL(info) << '\t' << graph[vertex].Name();
-            plugins.push_back(graph[vertex]);
+            tempPlugins.push_back(graph[vertex].Name());
         }
 
-        
         //Now sort exist plugins list according to order in tempPlugins.
-        /*plugins.sort([tempPlugins](const Plugin& first, const Plugin& second){
+        plugins.sort([tempPlugins](const Plugin& first, const Plugin& second){
             //Find both plugins, and compare distances from beginning.
             auto fIt = find(tempPlugins.begin(), tempPlugins.end(), first);
             auto sIt = find(tempPlugins.begin(), tempPlugins.end(), second);
@@ -126,7 +123,6 @@ namespace loot {
 
             return distance(tempPlugins.begin(), fIt) < distance(tempPlugins.begin(), sIt);
         });
-        */
     }
 
     void CheckForCycles(const PluginGraph& graph) {
diff --git a/src/gui/main.cpp b/src/gui/main.cpp
index faaab0b6..bc113d38 100644
--- a/src/gui/main.cpp
+++ b/src/gui/main.cpp
@@ -715,18 +715,6 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) {
     list<loot::Plugin> plugins;
     for (auto &plugin : _game->plugins) {
         plugins.push_back(plugin.second);
-
-        // Merge the masterlist data down into the plugins now, as userlist changes won't affect
-        // it.
-        BOOST_LOG_TRIVIAL(trace) << "Merging for plugin \"" << plugins.back().Name() << "\"";
-
-        //Check if there is a plugin entry in the masterlist. This will also find matching regex entries.
-        list<loot::Plugin>::iterator pos = std::find(_game->masterlist.plugins.begin(), _game->masterlist.plugins.end(), plugins.back());
-
-        if (pos != _game->masterlist.plugins.end()) {
-            BOOST_LOG_TRIVIAL(trace) << "Merging masterlist data down to plugin list data.";
-            plugins.back().MergeMetadata(*pos);
-        }
     }
     try {
         bool applyLoadOrder = false;
@@ -743,8 +731,16 @@ void Launcher::OnSortPlugins(wxCommandEvent& event) {
             for (boost::tie(vit, vitend) = boost::vertices(graph); vit != vitend; ++vit) {
                 BOOST_LOG_TRIVIAL(trace) << "Merging for plugin \"" << graph[*vit].Name() << "\"";
 
+                //Check if there is a plugin entry in the masterlist. This will also find matching regex entries.
+                list<loot::Plugin>::iterator pos = std::find(_game->masterlist.plugins.begin(), _game->masterlist.plugins.end(), graph[*vit]);
+
+                if (pos != _game->masterlist.plugins.end()) {
+                    BOOST_LOG_TRIVIAL(trace) << "Merging masterlist data down to plugin list data.";
+                    graph[*vit].MergeMetadata(*pos);
+                }
+
                 //Check if there is a plugin entry in the userlist. This will also find matching regex entries.
-                list<loot::Plugin>::iterator pos = std::find(_game->userlist.plugins.begin(), _game->userlist.plugins.end(), graph[*vit]);
+                pos = std::find(_game->userlist.plugins.begin(), _game->userlist.plugins.end(), graph[*vit]);
 
                 if (pos != _game->userlist.plugins.end() && pos->Enabled()) {
                     BOOST_LOG_TRIVIAL(trace) << "Merging userlist data down to plugin list data.";