From 31ac20f4861d3a3b702170de8e6f7f5143c6e40d Mon Sep 17 00:00:00 2001
From: James Whitehead II <jnwhiteh@gmail.com>
Date: Tue, 8 Dec 2009 23:53:03 +0000
Subject: [PATCH] Fix a bug that was causing helpful/harmful bindings to
 override out-of-combat bindings

---
 Clique.lua |   66 +++++++++++++++++++++++++++++-------------------------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/Clique.lua b/Clique.lua
index 0b758d4..75a47aa 100644
--- a/Clique.lua
+++ b/Clique.lua
@@ -199,6 +199,7 @@ function Clique:SpellBookButtonPressed(frame, button)
 	self:PLAYER_REGEN_ENABLED()
 end
 
+-- Player is LEAVING combat
 function Clique:PLAYER_REGEN_ENABLED()
 	self:ApplyClickSet(L.CLICKSET_DEFAULT)
 	self:RemoveClickSet(L.CLICKSET_HARMFUL)
@@ -206,6 +207,7 @@ function Clique:PLAYER_REGEN_ENABLED()
 	self:ApplyClickSet(self.ooc)
 end
 
+-- Player is ENTERING combat
 function Clique:PLAYER_REGEN_DISABLED()
 	self:RemoveClickSet(self.ooc)
 	self:ApplyClickSet(L.CLICKSET_DEFAULT)
@@ -218,46 +220,42 @@ function Clique:UpdateClicks()
 	local harm = self.clicksets[L.CLICKSET_HARMFUL]
 	local help = self.clicksets[L.CLICKSET_HELPFUL]
 
-	self.ooc = self.ooc or {}
-	for k,v in pairs(self.ooc) do self.ooc[k] = nil end
+    -- Since harm/help buttons take priority over any others, we can't
+    --
+    -- just apply the OOC set last.  Instead we use the self.ooc pseudo
+    -- set (which we build here) which contains only those help/harm
+    -- buttons that don't conflict with those defined in OOC.
 
-	for modifier,entry in pairs(harm) do
-		local button = string.gsub(entry.button, "harmbutton", "")
-		button = tonumber(button)
-		local mask = false
+    self.ooc = table.wipe(self.ooc or {})
 
-		for k,v in pairs(ooc) do
- 			if button == v.button and v.modifier == entry.modifier then
-				mask = true
-			end
-		end
-
-		if not mask then
-			table.insert(self.ooc, entry)
-		end
-	end
-
-	for modifier,entry in pairs(help) do
-		local button = string.gsub(entry.button, "helpbutton", "")
-		button = tonumber(button)
-		local mask = false
+    -- Create a hash map of the "taken" combinations
+    local takenBinds = {}
 
-		for k,v in pairs(ooc) do
- 			if button == v.button and v.modifier == entry.modifier then
-				mask = true
-			end
-		end
+    for name, entry in pairs(ooc) do
+        local key = string.format("%s:%s", entry.modifier, entry.button)
+        takenBinds[key] = true
+        table.insert(self.ooc, entry)
+    end
 
-		if not mask then
-			table.insert(self.ooc, entry)
-		end
-	end
+    for name, entry in pairs(harm) do
+        local button = string.gsub(entry.button, "harmbutton", "")
+        local key = string.format("%s:%s", entry.modifier, button)
+        if not takenBinds[key] then
+            takenBinds[key] = true
+            table.insert(self.ooc, entry)
+        end
+    end
 
-	for modifier,entry in pairs(ooc) do
-		table.insert(self.ooc, entry)
-	end
+    for name, entry in pairs(help) do
+        local button = string.gsub(entry.button, "helpbutton", "")
+        local key = string.format("%s:%s", entry.modifier, button)
+        if not takenBinds[key] then
+            takenBinds[key] = true
+            table.insert(self.ooc, entry)
+        end
+    end
 	
-	self:UpdateTooltip()
+    self:UpdateTooltip()
 end
 
 function Clique:RegisterFrame(frame)
-- 
1.7.9.5