From 475aa5a8fc4c0b0eaf46c75d9010a08897f1a146 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Fri, 10 Apr 2015 16:31:29 -0400
Subject: [PATCH] code review

---
 src/js/messaging.js | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/js/messaging.js b/src/js/messaging.js
index b0d38f3f6..0171d3ed9 100644
--- a/src/js/messaging.js
+++ b/src/js/messaging.js
@@ -459,9 +459,6 @@ var tagNameToRequestTypeMap = {
 
 var filterRequests = function(pageStore, details) {
     var requests = details.requests;
-    if ( !pageStore || !pageStore.getNetFilteringSwitch() ) {
-        return requests;
-    }
     if ( µb.userSettings.collapseBlocked === false ) {
         return requests;
     }
@@ -508,10 +505,10 @@ var onMessage = function(details, sender, callback) {
     switch ( details.what ) {
         case 'retrieveGenericCosmeticSelectors':
             response = {
-                shutdown: !pageStore || pageStore.getGenericCosmeticFilteringSwitch() === false,
+                shutdown: !pageStore || !pageStore.getNetFilteringSwitch(),
                 result: null
             };
-            if ( response.shutdown === false ) {
+            if ( !response.shutdown && pageStore.getGenericCosmeticFilteringSwitch() ) {
                 response.result = µb.cosmeticFilteringEngine.retrieveGenericSelectors(details);
             }
             break;
@@ -520,13 +517,12 @@ var onMessage = function(details, sender, callback) {
             µb.cosmeticFilteringEngine.addToSelectorCache(details);
             break;
 
-        // Evaluate many requests
         case 'filterRequests':
             response = {
-                shutdown: !pageStore || pageStore.getGenericCosmeticFilteringSwitch() === false,
+                shutdown: !pageStore || !pageStore.getNetFilteringSwitch(),
                 result: null
             };
-            if ( response.shutdown === false ) {
+            if ( !response.shutdown ) {
                 response.result = filterRequests(pageStore, details);
             }
             break;