X-Git-Url: https://www.aleksib.fi/git/wowui.git/blobdiff_plain/82ce2fc4623897a0b8ca99baac27f7c433226366..0c898538cf7e4480bd14b1b38d17a48ea2fbb5a0:/OmaUF/UnitFrames.lua

diff --git a/OmaUF/UnitFrames.lua b/OmaUF/UnitFrames.lua
index 6f40e0d..1fd993d 100644
--- a/OmaUF/UnitFrames.lua
+++ b/OmaUF/UnitFrames.lua
@@ -3,7 +3,7 @@ local _;
 local pairs = pairs;
 local InCombatLockdown = InCombatLockdown;
 
-local UnitFrames = CreateFrame("Frame", "OmaUnitFrames", UIParent);
+local UnitFrames = CreateFrame("Frame", "OmaUnitFrame", UIParent);
 
 local M = {};
 OmaUnitFrames = M;
@@ -33,13 +33,14 @@ local function hideBlizzardFrames()
         table.insert(frames, _G["Boss"..i.."TargetFrame"]);
         table.insert(frames, _G["Boss"..i.."TargetFrameHealthBar"]);
         table.insert(frames, _G["Boss"..i.."TargetFrameManaBar"]);
+        -- keep boss frame powerBarAlt
     end
     for _, frame in pairs(frames) do
         frame:UnregisterAllEvents();
         if frame.healthbar then frame.healthbar:UnregisterAllEvents() end
         if frame.manabar then frame.manabar:UnregisterAllEvents() end
         if frame.spellbar then frame.spellbar:UnregisterAllEvents() end
-        if frame.powerBarAlt then frame.powerBarAlt:UnregisterAllEvents() end
+        --if frame.powerBarAlt then frame.powerBarAlt:UnregisterAllEvents() end
         frame:Hide();
     end
 
@@ -59,7 +60,6 @@ local hiddenFrame = CreateFrame("Frame");
 hiddenFrame:Hide();
 local arenaHidden = false;
 local function hideArenaFrames()
-    -- not run if /reload happens in combat, may cause problems?
     if not arenaHidden and not InCombatLockdown() then
         arenaHidden = true;
         ArenaEnemyFrames:UnregisterAllEvents();
@@ -73,11 +73,11 @@ end
 UnitFrames:RegisterEvent("PLAYER_LOGIN");
 UnitFrames:RegisterEvent("ADDON_LOADED");
 UnitFrames:SetScript("OnEvent", function(self, event, addon)
-    if event == "PLAYER_LOGIN" then
+    if event == "ADDON_LOADED" and addon == "Blizzard_ArenaUI" then
+        hideArenaFrames();
+    elseif event == "PLAYER_LOGIN" then
         OmaUFLoadChar();
         hideBlizzardFrames();
         initialize();
-    elseif event == "ADDON_LOADED" and addon == "Blizzard_ArenaUI" then
-        hideArenaFrames();
     end
 end);