Quantcast

Moved higher checkbox for confirm, changes some calls to be tail calls

Alar of Daggerspine [03-10-15 - 22:25]
Moved higher checkbox for confirm, changes some calls to be tail calls

Signed-off-by: Alar of Daggerspine <alar@aspide.it>
Filename
FollowerPage.lua
diff --git a/FollowerPage.lua b/FollowerPage.lua
index 4f279b8..2625eb6 100644
--- a/FollowerPage.lua
+++ b/FollowerPage.lua
@@ -84,12 +84,12 @@ local function UpgradeFollower(this)
 		losing=(mylevel+level)-GARRISON_FOLLOWER_MAX_ITEM_LEVEL
 	end
 	if losing then
-		addon:Popup(format(CONFIRM2,losing,name),0,DoUpgradeFollower,true,followerID,true)
+		return addon:Popup(format(CONFIRM2,losing,name),0,DoUpgradeFollower,true,followerID,true)
 	else
 		if addon:GetToggle("NOCONFIRM") then
-			G.CastSpellOnFollower(followerID);
+			return G.CastSpellOnFollower(followerID);
 		else
-			addon:Popup(format(CONFIRM1,mylevel+level,name),0,DoUpgradeFollower,true,followerID,true)
+			return addon:Popup(format(CONFIRM1,mylevel+level,name),0,DoUpgradeFollower,true,followerID,true)
 		end
 	end
 end
@@ -116,7 +116,7 @@ function addon:ShowUpgradeButtons(force)
 	end
 	if (not gf.noConfirm) then
 		gf.noConfirm=self:GetFactory():Checkbox(gf.Model,self:GetToggle("NOCONFIRM"),self:GetVarInfo("NOCONFIRM"))
-		gf.noConfirm:SetPoint("TOPLEFT",0,-25)
+		gf.noConfirm:SetPoint("TOPLEFT",0,-20)
 		gf.noConfirm:Show()
 		gf.noConfirm:SetScript("OnClick",function(this)
 			addon:SetBoolean("NOCONFIRM",this:GetChecked())