From 1c10f11fad2ebb6aaf2d5b9ac8c48f7c1d182353 Mon Sep 17 00:00:00 2001
From: Hendrik Leppkes <h.leppkes@gmail.com>
Date: Sat, 15 Mar 2008 16:30:44 +0000
Subject: [PATCH] fix cyCircled support causing taint messages in some cases

---
 Bartender4.toc  | 2 +-
 ButtonBar.lua   | 6 ++++--
 ButtonStyle.lua | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Bartender4.toc b/Bartender4.toc
index 88cf711..679ca72 100644
--- a/Bartender4.toc
+++ b/Bartender4.toc
@@ -3,7 +3,7 @@
 ## Title: Bartender4
 ## Author: Nevcairiel
 ## SavedVariables: Bartender4DB
-## OptionalDeps: Ace3, cyCircled
+## OptionalDeps: Ace3
 ## X-Embeds: Ace3
 ## X-Category: Action Bars
 ## Version: 4.0
diff --git a/ButtonBar.lua b/ButtonBar.lua
index 9068893..0def297 100644
--- a/ButtonBar.lua
+++ b/ButtonBar.lua
@@ -176,8 +176,10 @@ function ButtonBar:GetStyle()
 end
 
 function ButtonBar:SetStyle(style)
-	self.config.style = style
-	self:ForAll("ApplyStyle", style)
+	if style then
+		self.config.style = style
+	end
+	self:ForAll("ApplyStyle", self.config.style)
 end
 
 
diff --git a/ButtonStyle.lua b/ButtonStyle.lua
index 1956bb3..2d3e969 100644
--- a/ButtonStyle.lua
+++ b/ButtonStyle.lua
@@ -92,5 +92,5 @@ end
 
 function Bartender4:cyLoaded()
 	cydb = cyCircled_Bartender4 and cyCircled_Bartender4.db
-	Bartender4.Bar:ForAll("ApplyConfig")
+	Bartender4.Bar:ForAll("SetStyle")
 end