From ae77e5533084a07f92f2846960255afa59c22eab Mon Sep 17 00:00:00 2001 From: shagu Date: Tue, 2 Feb 2021 17:32:59 +0100 Subject: [PATCH] actionbar: allow to put actions on bar in combat skip custom drag stop events during combat to allow client actions to be run instead of tainting the ui. --- modules/actionbar.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/actionbar.lua b/modules/actionbar.lua index 442a6fd2..60d8f8a3 100644 --- a/modules/actionbar.lua +++ b/modules/actionbar.lua @@ -283,6 +283,9 @@ pfUI:RegisterModule("actionbar", "vanilla:tbc", function () end local function ButtonDrag(self) + -- skip during combat + if InCombatLockdown and InCombatLockdown() then return end + local self = self or this if _G.LOCK_ACTIONBAR == "1" and not (pfUI_config.bars.shiftdrag == "1" and IsShiftKeyDown()) then return end @@ -295,6 +298,9 @@ pfUI:RegisterModule("actionbar", "vanilla:tbc", function () end local function ButtonDragStop(self) + -- skip during combat + if InCombatLockdown and InCombatLockdown() then return end + local self = self or this if MacroFrame_SaveMacro then