From fddc7a14f88a2a4ef13ac7ae2646a17fdad1b7fe Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Tue, 19 Jan 2016 21:51:41 +0000
Subject: [PATCH] Fix UI when sorting disables conflicts filter

If sorting fails or doesn't change the load order, the plugin lists were
not being updated to reflect that the conflicts filter may have been
disabled.
---
 src/gui/html/js/events.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/gui/html/js/events.js b/src/gui/html/js/events.js
index 1110c98d..229eec41 100644
--- a/src/gui/html/js/events.js
+++ b/src/gui/html/js/events.js
@@ -86,7 +86,10 @@ function onUpdateMasterlist() {
   }).catch(handlePromiseError);
 }
 function onSortPlugins() {
-  undoConflictsFilter();
+  if (undoConflictsFilter()) {
+    /* Conflicts filter was undone, update the displayed cards. */
+    filterPluginData(loot.game.plugins, loot.filters);
+  }
 
   let promise = Promise.resolve();
   if (loot.settings.updateMasterlist) {
@@ -515,6 +518,8 @@ function onEditorClose(evt) {
   }).catch(handlePromiseError);
 }
 function undoConflictsFilter() {
+  let wasConflictsFilterEnabled = (loot.filters.conflictTargetPluginName);
+
   loot.filters.conflictTargetPluginName = undefined;
   /* Deactivate any existing plugin conflict filter. */
   loot.game.plugins.forEach((plugin) => {
@@ -525,6 +530,8 @@ function undoConflictsFilter() {
   for (let i = 0; i < cards.length; ++i) {
     cards[i].classList.toggle('highlight', false);
   }
+
+  return wasConflictsFilterEnabled;
 }
 function onConflictsFilter(evt) {
   /* Deactivate any existing plugin conflict filter. */