2.2.6

git [03-26-18 - 15:55]
2.2.6
Filename
FurnitureCatalogue/FurCFilter.lua
FurnitureCatalogue/FurnitureCatalogue.txt
diff --git a/FurnitureCatalogue/FurCFilter.lua b/FurnitureCatalogue/FurCFilter.lua
index f3bed55..edbd444 100644
--- a/FurnitureCatalogue/FurCFilter.lua
+++ b/FurnitureCatalogue/FurCFilter.lua
@@ -155,21 +155,22 @@ function FurC.MatchFilter(currentItemId, currentRecipeArray)
 	itemType, sItemType = GetItemLinkItemType(itemLink)

     if  filterBooks(itemId, recipeArray)			                        then return false end
+

     if recipeArray.origin == FURC_RUMOUR then
-        if filterAllOnTextSearch then return not FurC.GetFilterAllOnTextNoRumour() end
-        return hideRumours and recipeArray.origin == FURC_RUMOUR
+        if filterAllOnTextSearch and not FurC.GetFilterAllOnTextNoRumour() then return false end
+        if (hideRumours and recipeArray.origin == FURC_RUMOUR) then return false end
     end

     if recipeArray.origin == FURC_CROWN then
-        if filterAllOnTextSearch then return not FurC.GetFilterAllOnTextNoCrown() end
-        return hideCrownStore and ddSource ~= FURC_CROWN
+        if filterAllOnTextSearch and FurC.GetFilterAllOnTextNoCrown() then return false end
+        if hideCrownStore and ddSource ~= FURC_CROWN then return false end
     end

-    if not filterAllOnTextSearch then
-        if not matchDropdownFilter()                                            then return false end
-    end
+    if not (filterAllOnTextSearch or  matchDropdownFilter()) then return false end
+

+     if not matchSearchString                                                then return false end
     if not matchSearchString() 												    then return false end
 	if not (FurC.settings.filterCraftingTypeAll or matchCraftingTypeFilter())	then return false end
 	if not (FurC.settings.filterQualityAll 		or matchQualityFilter())		then return false end
diff --git a/FurnitureCatalogue/FurnitureCatalogue.txt b/FurnitureCatalogue/FurnitureCatalogue.txt
index d69c8cf..ba438d3 100644
--- a/FurnitureCatalogue/FurnitureCatalogue.txt
+++ b/FurnitureCatalogue/FurnitureCatalogue.txt
@@ -1,6 +1,6 @@
 ## Title: FurnitureCatalogue
 ## Author: manavortex
-## Version: 2.2.5
+## Version: 2.2.6
 ## APIVersion: 100022
 ## SavedVariables: FurnitureCatalogue_Settings
 ## OptionalDependsOn: pChat