Issue 2298 - Fixed: "Block element" from context menu doesn't reset previous state

include.postload.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 339 matching lines @@
   document.removeEventListener("mouseleave", clickHide_stopPropagation, true);
   document.removeEventListener("mouseover", clickHide_mouseOver, true);
   document.removeEventListener("mouseout", clickHide_mouseOut, true);
   document.removeEventListener("click", clickHide_mouseClick, true);
   document.removeEventListener("keydown", clickHide_keyDown, true);
 }
 
 function clickHide_deactivate()
 {
   clickHide_rulesPending();
+
   clickHide_filters = null;
+  lastRightClickEvent = null;
 
   if (currentElement)
   {
     currentElement.removeEventListener("contextmenu",  clickHide_elementClickHandler, true);
     unhighlightElements();
     unhighlightElement(currentElement);
     currentElement = null;
   }
   unhighlightElements();
 
@@ skipping 317 matching lines @@
         break;
       case "clickhide-activate":
         clickHide_activate();
         break;
       case "clickhide-deactivate":
         clickHide_deactivate();
         break;
       case "clickhide-new-filter":
         if(lastRightClickEvent)
         {
-          getBlockableElementOrAncestor(lastRightClickEvent.target, function(element)
+          var event = lastRightClickEvent;
+          getBlockableElementOrAncestor(event.target, function(element)
           {
             clickHide_activate();
             currentElement = element;
-            clickHide_mouseClick(lastRightClickEvent);
+            clickHide_mouseClick(event);
           });
         }
         break;
       case "clickhide-init":
         if (clickHideFiltersDialog)
         {
           sendResponse({filters: clickHide_filters});
 
           clickHideFiltersDialog.style.width = msg.width + "px";
           clickHideFiltersDialog.style.height = msg.height + "px";
@@ skipping 35 matching lines @@
           lastRightClickEventValid = false;
         else
           lastRightClickEvent = null;
         break;
     }
   });
 
   if (window == window.top)
     ext.backgroundPage.sendMessage({type: "report-html-page"});
 }