6e06bfb - Fix character settings loading

[wowui.git] / OmaUF / Events.lua

diff --git a/OmaUF/Events.lua b/OmaUF/Events.lua
index cd8bd7f..0e63e9c 100644 (file)
--- a/OmaUF/Events.lua
+++ b/OmaUF/Events.lua
@@ -18,6 +18,8 @@ local UnitGroupRolesAssigned = UnitGroupRolesAssigned;
 local UnitLevel, UnitClassification = UnitLevel, UnitClassification;
 local RAID_CLASS_COLORS = RAID_CLASS_COLORS;
 
 local UnitLevel, UnitClassification = UnitLevel, UnitClassification;
 local RAID_CLASS_COLORS = RAID_CLASS_COLORS;
 

+local updateAuraFrames = OmaUFAuras.UpdateAuras;
+

 local Settings = OmaUFSettings;
 local baseColor = Settings.BaseColor;
 local overlayColorDispel = Settings.OverlayColorDispel;
 local Settings = OmaUFSettings;
 local baseColor = Settings.BaseColor;
 local overlayColorDispel = Settings.OverlayColorDispel;


@@ -201,6 +203,7 @@ local function updateHealAbsorb(frame, unit)
 end
 
 local function updateAuras(frame, unit)
 end
 
 local function updateAuras(frame, unit)

+    updateAuraFrames(frame, unit);

     if UnitIsFriend("player", unit) and UnitDebuff(unit, 1, "RAID") ~= nil then
         -- something dispellable
         if frame.overlay.color ~= overlayColorDispel then
     if UnitIsFriend("player", unit) and UnitDebuff(unit, 1, "RAID") ~= nil then
         -- something dispellable
         if frame.overlay.color ~= overlayColorDispel then


@@ -209,7 +212,7 @@ local function updateAuras(frame, unit)
             frame.overlay.color = overlayColorDispel;
         end
     -- don't overlay charmed when in vehicle
             frame.overlay.color = overlayColorDispel;
         end
     -- don't overlay charmed when in vehicle

-    elseif UnitIsCharmed(unit) and unit == frame.unit then
+    elseif UnitIsCharmed(unit) and not frame.inVehicle then

         if frame.overlay.color ~= overlayColorCharm then
             frame.overlay:SetVertexColor(unpack(overlayColorCharm));
             frame.overlay:Show();
         if frame.overlay.color ~= overlayColorCharm then
             frame.overlay:SetVertexColor(unpack(overlayColorCharm));
             frame.overlay:Show();