From 9bc1d176ef8af055b1305bd58e68166e1c0463e0 Mon Sep 17 00:00:00 2001 From: Xruptor Date: Sat, 30 Oct 2010 11:48:55 -0400 Subject: [PATCH] -Slight fix for the search window. It should no longer display items in the guild if the guild feature is turned off in the BagSync settings. --- BagSync.toc | 2 +- BagSync_Search.lua | 37 ++++++++++++++++++++----------------- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/BagSync.toc b/BagSync.toc index 165c73d..6bf5744 100644 --- a/BagSync.toc +++ b/BagSync.toc @@ -2,7 +2,7 @@ ## Title: BagSync ## Notes: BagSync tracks your characters items and displays it within tooltips. ## Author: Xruptor -## Version: 5.3 +## Version: 5.4 ## SavedVariables: BagSyncDB, BagSyncOpt, BagSyncGUILD_DB, BagSyncTOKEN_DB localization\localization.lua diff --git a/BagSync_Search.lua b/BagSync_Search.lua index 57f19db..8b3e800 100644 --- a/BagSync_Search.lua +++ b/BagSync_Search.lua @@ -226,27 +226,30 @@ function bgSearch:DoSearch() end end - local guildN = BagSyncDB[currentRealm][k].guild or nil - - --check the guild bank if the character is in a guild - if BagSyncGUILD_DB and guildN and BagSyncGUILD_DB[currentRealm][guildN] then - --check to see if this guild has already been done through this run (so we don't do it multiple times) - if not previousGuilds[guildN] then - for q, r in pairs(BagSyncGUILD_DB[currentRealm][guildN]) do - local dblink, dbcount = strsplit(',', r) - if dblink then - local dName, dLinkD, dRarity = GetItemInfo(dblink) - if dName then - --we found a match - if not tempList[dblink] and ItemSearch:Find(dblink, searchStr) then - table.insert(searchTable, { name=dName, link=dLinkD, rarity=dRarity } ) - tempList[dblink] = dName - count = count + 1 + --only search guild if the guild features are on + if BagSyncOpt.enableGuild then + local guildN = BagSyncDB[currentRealm][k].guild or nil + + --check the guild bank if the character is in a guild + if BagSyncGUILD_DB and guildN and BagSyncGUILD_DB[currentRealm][guildN] then + --check to see if this guild has already been done through this run (so we don't do it multiple times) + if not previousGuilds[guildN] then + for q, r in pairs(BagSyncGUILD_DB[currentRealm][guildN]) do + local dblink, dbcount = strsplit(',', r) + if dblink then + local dName, dLinkD, dRarity = GetItemInfo(dblink) + if dName then + --we found a match + if not tempList[dblink] and ItemSearch:Find(dblink, searchStr) then + table.insert(searchTable, { name=dName, link=dLinkD, rarity=dRarity } ) + tempList[dblink] = dName + count = count + 1 + end end end end + previousGuilds[guildN] = true end - previousGuilds[guildN] = true end end -- 1.7.9.5