from retail

WeakAuras/Conditions.lua

@@ -747,7 +747,7 @@ local function runDynamicConditionFunctions(funcs)
   end
 end
 
-local function UpdateDynamicConditonsStates(self, event)
+local function UpdateDynamicConditionsStates(self, event)
   if (globalDynamicConditionFuncs[event]) then
     for i, func in ipairs(globalDynamicConditionFuncs[event]) do
       func(globalConditionState);
@@ -757,7 +757,7 @@ end
 
 local function handleDynamicConditions(self, event)
   Private.StartProfileSystem("dynamic conditions")
-  UpdateDynamicConditonsStates(self, event)
+  UpdateDynamicConditionsStates(self, event)
   if (dynamicConditions[event]) then
     runDynamicConditionFunctions(dynamicConditions[event]);
   end
@@ -883,7 +883,7 @@ function Private.RegisterForGlobalConditions(uid)
         UpdateDynamicConditionsPerUnitState(dynamicConditionsFrame, event, unit)
       else
         pcall(dynamicConditionsFrame.RegisterEvent, dynamicConditionsFrame, event);
-        UpdateDynamicConditonsStates(dynamicConditionsFrame, event)
+        UpdateDynamicConditionsStates(dynamicConditionsFrame, event)
       end
     end
   end

WeakAuras/GenericTrigger.lua

@@ -1796,10 +1796,10 @@ function GenericTrigger.Add(data, region)
   end
 
   if warnAboutCLEUEvents then
-    Private.AuraWarnings.UpdateWarning(data.uid, "spamy_event_warning", "warning",
+    Private.AuraWarnings.UpdateWarning(data.uid, "spammy_event_warning", "warning",
                 L["COMBAT_LOG_EVENT_UNFILTERED with no filter can trigger frame drops in raid environment. Find more information:\nhttps://github.com/WeakAuras/WeakAuras2/wiki/Deprecated-CLEU"])
   else
-    Private.AuraWarnings.UpdateWarning(data.uid, "spamy_event_warning")
+    Private.AuraWarnings.UpdateWarning(data.uid, "spammy_event_warning")
   end
 end
 
@@ -3183,7 +3183,10 @@ do
   end
 
   function WeakAuras.GetDBMStage()
-    return DBM:GetStage()
+    if DBM then
+      return DBM:GetStage()
+    end
+    return 0, 0
   end
 
   function WeakAuras.GetDBMTimerById(id)

WeakAuras/Profiling.lua

@@ -410,7 +410,7 @@ function RealTimeProfilingWindow:GetBar(name)
   else
     local bar = CreateFrame("Frame", nil, self.barsFrame)
     self.bars[name] = bar
-    WeakAuras.Mixin(bar, SmoothStatusBarMixin)
+    WeakAuras.Mixin(bar, Private.SmoothStatusBarMixin)
     bar.name = name
     bar.parent = self
     bar:SetHeight(self.barHeight)

WeakAuras/Prototypes.lua

@@ -4070,7 +4070,7 @@ Private.event_prototypes = {
         trigger.use_cloneId and "true" or "false",
         trigger.use_extend and tonumber(trigger.extend or 0) or 0,
         trigger.use_remaining and "true" or "false",
-        trigger.remaining or 0,
+        trigger.remaining and tonumber(trigger.remaining or 0) or 0,
         trigger.use_dbmType and trigger.dbmType or "nil",
         trigger.remaining_operator or "<"
       )
@@ -4310,7 +4310,7 @@ Private.event_prototypes = {
         trigger.use_cloneId and "true" or "false",
         trigger.use_extend and tonumber(trigger.extend or 0) or 0,
         trigger.use_remaining and "true" or "false",
-        type(trigger.remaining) == "number" and trigger.remaining or 0,
+        trigger.remaining and tonumber(trigger.remaining or 0) or 0,
         trigger.use_emphasized == nil and "nil" or trigger.use_emphasized and "true" or "false",
         trigger.use_cast == nil and "nil" or trigger.use_cast and "true" or "false",
         trigger.use_isCooldown == nil and "nil" or trigger.use_isCooldown and "true" or "false",
@@ -4918,7 +4918,7 @@ Private.event_prototypes = {
         trigger.use_totemNamePattern and trigger.totemNamePattern_operator or "",
         trigger.use_clones and "true" or "false",
         trigger.use_inverse and "true" or "false",
-        trigger.use_remaining and trigger.remaining or "nil",
+        trigger.use_remaining and tonumber(trigger.remaining or 0) or "nil",
         trigger.use_remaining and trigger.remaining_operator or "<");
       return ret;
     end,

WeakAuras/RegionTypes/RegionPrototype.lua

@@ -203,6 +203,9 @@ local function SoundPlayHelper(self)
 end
 
 local function hasSound(options)
+  --if options.sound_type == "Stop" then
+    --return true
+  --end
   if (options.sound == " custom") then
     if (options.sound_path and options.sound_path ~= "") then
       return true

WeakAuras/RegionTypes/SmoothStatusBarMixin.lua

@@ -3,7 +3,7 @@ if not WeakAuras.IsLibsOK() then return end
 local AddonName, Private = ...
 
 -- This is a more or less 1:1 copy of SmoothStatusBarMixin except that it
--- doesn't clamp the targetValue in ProcesSmoothStatusBars, because that's incorrect for us
+-- doesn't clamp the targetValue in ProcessSmoothStatusBars, because that's incorrect for us
 local g_updatingBars = {};
 
 local function IsCloseEnough(bar, newValue, targetValue)