# HG changeset patch
# User contrebasse
# Date 1307096644 -7200
# Node ID c79ab5443ee540161df0e14b6c1fbd6b1509ba15
# Parent  69300309ac21acfbb6984625728ccbb83d44837a
Corrected the lua error when entering combat

diff -r 69300309ac21 -r c79ab5443ee5 CampFireButton.lua
--- a/CampFireButton.lua	Thu Jun 02 23:07:49 2011 +0200
+++ b/CampFireButton.lua	Fri Jun 03 12:24:04 2011 +0200
@@ -67,8 +67,10 @@
 
 -- Hide button
 function A.HideCampFireBtn()
-	if btn then btn:Hide() end
-	btn:UnregisterAllEvents()
+	if btn then
+		btn:Hide()
+		btn:UnregisterAllEvents()
+	end
 end
 
 -- Show button if applicable
diff -r 69300309ac21 -r c79ab5443ee5 ReagentMaker.lua
--- a/ReagentMaker.lua	Thu Jun 02 23:07:49 2011 +0200
+++ b/ReagentMaker.lua	Fri Jun 03 12:24:04 2011 +0200
@@ -79,8 +79,6 @@
 --@todo Unregister events when not needed
 A.EventsFrame:RegisterEvent("TRADE_SKILL_SHOW")
 A.EventsFrame:RegisterEvent("TRADE_SKILL_UPDATE")
-A.EventsFrame:RegisterEvent("PLAYER_REGEN_ENABLED")
-A.EventsFrame:RegisterEvent("PLAYER_REGEN_DISABLED")
 
 
 ---------------------------------------------------
@@ -118,6 +116,10 @@
 	A.tooltipRecipe:SetFrameStrata("TOOLTIP")
 	A.tooltipRecipe:Hide()
 
+	-- Used for the campfire button only
+	A.EventsFrame:RegisterEvent("PLAYER_REGEN_ENABLED")
+	A.EventsFrame:RegisterEvent("PLAYER_REGEN_DISABLED")
+	
 	-- Button for enchanting directy on a scroll
 	A.LoadEnchantOnScroll()
 end -- function