From 28da48a9c0314c27fa9085d348e1008cd180c79e Mon Sep 17 00:00:00 2001
From: Oliver Hamlet <oliver.hamlet@gmail.com>
Date: Wed, 8 Jun 2016 07:04:46 +0100
Subject: [PATCH] Fix conflicts filter not hiding cards correctly

---
 src/gui/html/js/events.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gui/html/js/events.js b/src/gui/html/js/events.js
index 33e4ecde..d0083196 100644
--- a/src/gui/html/js/events.js
+++ b/src/gui/html/js/events.js
@@ -409,8 +409,6 @@ function onEditorClose(evt) {
   }).catch(loot.handlePromiseError);
 }
 function onConflictsFilter(evt) {
-  /* Deactivate any existing plugin conflict filter. */
-  loot.filters.deactivateConflictsFilter();
   /* evt.currentTarget.value is the name of the target plugin, or an empty string
      if the filter has been deactivated. */
   if (evt.currentTarget.value) {
@@ -423,10 +421,13 @@ function onConflictsFilter(evt) {
           gamePlugin.update(plugin);
         }
       });
+      filterPluginData(loot.game.plugins, loot.filters);
       loot.Dialog.closeProgress();
     }).catch(loot.handlePromiseError);
+  } else {
+    loot.filters.deactivateConflictsFilter();
+    filterPluginData(loot.game.plugins, loot.filters);
   }
-  filterPluginData(loot.game.plugins, loot.filters);
 }
 function onCopyMetadata(evt) {
   loot.query('copyMetadata', evt.target.getName()).then(() => {