From 270b226e6b3b084bb811725f991405fbc5f8cfbb Mon Sep 17 00:00:00 2001
From: shagu <ericmauser@googlemail.com>
Date: Sat, 26 May 2018 00:04:13 +0200
Subject: [PATCH] buff: update weapon buffs on config change

---
 modules/buff.lua | 19 ++++++++-----------
 modules/gui.lua  |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/modules/buff.lua b/modules/buff.lua
index 75d780da..d4b191ec 100644
--- a/modules/buff.lua
+++ b/modules/buff.lua
@@ -242,12 +242,8 @@ pfUI:RegisterModule("buff", function ()
   pfUI.buff.wepbuffs = CreateFrame("Frame", "pfWepBuffFrame", UIParent)
   pfUI.buff.wepbuffs.count = 0
   pfUI.buff.wepbuffs.buttons = {}
-  if C.buffs.separateweapons == "1" then
-    for i=1,2 do
-      pfUI.buff.wepbuffs.buttons[i] = CreateBuffButton(i, "HELPFUL", 1)
-    end
-  else
-    pfUI.buff.wepbuffs:Hide()
+  for i=1,2 do
+    pfUI.buff.wepbuffs.buttons[i] = CreateBuffButton(i, "HELPFUL", 1)
   end
 
   -- Buff Frame
@@ -264,7 +260,6 @@ pfUI:RegisterModule("buff", function ()
     pfUI.buff.debuffs.buttons[i] = CreateBuffButton(i, "HARMFUL")
   end
 
-
   -- config loading
   function pfUI.buff:UpdateConfigBuffButton(buff)
     local fontsize = C.buffs.fontsize == "-1" and C.global.font_size or C.buffs.fontsize
@@ -323,7 +318,11 @@ pfUI:RegisterModule("buff", function ()
       pfUI.buff.wepbuffs:SetWidth(tonumber(C.buffs.wepbuffrowsize) * (tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing)))
       pfUI.buff.wepbuffs:SetHeight(ceil(2/tonumber(C.buffs.wepbuffrowsize)) * ((C.buffs.textinside == "1" and 0 or (fontsize*1.5))+tonumber(C.buffs.size)+2*tonumber(C.buffs.spacing)))
       pfUI.buff.wepbuffs:SetPoint("TOPRIGHT", pfUI.buff.debuffs, "BOTTOMRIGHT", 0, 0)
+      pfUI.buff.wepbuffs:Show()
       UpdateMovable(pfUI.buff.wepbuffs)
+    else
+      pfUI.buff.wepbuffs:Hide()
+      RemoveMovable(pfUI.buff.wepbuffs)
     end
 
     for i=1,32 do
@@ -334,10 +333,8 @@ pfUI:RegisterModule("buff", function ()
       pfUI.buff:UpdateConfigBuffButton(pfUI.buff.debuffs.buttons[i])
     end
 
-    if C.buffs.separateweapons == "1" then
-      for i=1,2 do
-        pfUI.buff:UpdateConfigBuffButton(pfUI.buff.wepbuffs.buttons[i])
-      end
+    for i=1,2 do
+      pfUI.buff:UpdateConfigBuffButton(pfUI.buff.wepbuffs.buttons[i])
     end
 
     pfUI.buff:GetScript("OnEvent")()
diff --git a/modules/gui.lua b/modules/gui.lua
index d4288ee2..e4ef13a5 100644
--- a/modules/gui.lua
+++ b/modules/gui.lua
@@ -981,7 +981,7 @@ pfUI:RegisterModule("gui", function ()
       CreateConfig(update["buff"], this, T["Enable Buff Display"], C.buffs, "buffs", "checkbox")
       CreateConfig(update["buff"], this, T["Enable Debuff Display"], C.buffs, "debuffs", "checkbox")
       CreateConfig(update["buff"], this, T["Enable Weapon Buff Display"], C.buffs, "weapons", "checkbox")
-      CreateConfig(nil, this, T["Seperate Weapon Buffs"], C.buffs, "separateweapons", "checkbox")
+      CreateConfig(update["buff"], this, T["Seperate Weapon Buffs"], C.buffs, "separateweapons", "checkbox")
       CreateConfig(update["buff"], this, T["Buff Size"], C.buffs, "size")
       CreateConfig(update["buff"], this, T["Buff Spacing"], C.buffs, "spacing")
       CreateConfig(update["buff"], this, T["Number Of Weapon Buffs Per Row"], C.buffs, "wepbuffrowsize")