pcall instead xpcall

WeakAuras/RegionTypes/DynamicGroup.lua

@@ -310,9 +310,11 @@ local sorters = {
     local sortFunc = WeakAuras.LoadFunction("return " .. sortStr, data.id, "custom sort") or noop
     return function(a, b)
       WeakAuras.ActivateAuraEnvironment(data.id)
-      local result = sortFunc(a, b)
+      local ok, result = pcall(sortFunc, a, b)
       WeakAuras.ActivateAuraEnvironment()
-      if result then
+      if not ok then
+        geterrorhandler()(result)
+      else
         return result
       end
     end
@@ -367,7 +369,10 @@ local anchorers = {
     local anchorFunc = WeakAuras.LoadFunction("return " .. anchorStr, data.id, "custom frame anchor") or noop
     return function(frames, activeRegions)
       WeakAuras.ActivateAuraEnvironment(data.id)
-      anchorFunc(frames, activeRegions)
+      local ok, ret = pcall(anchorFunc, frames, activeRegions)
+      if not ok then
+        geterrorhandler()(ret)
+      end
       WeakAuras.ActivateAuraEnvironment()
     end
   end
@@ -715,11 +720,12 @@ local growers = {
     local growFunc = WeakAuras.LoadFunction("return " .. growStr, data.id, "custom grow") or noop
     return function(newPositions, activeRegions)
       WeakAuras.ActivateAuraEnvironment(data.id)
-      growFunc(newPositions, activeRegions)
+      local ok, ret = pcall(growFunc, newPositions, activeRegions)
       WeakAuras.ActivateAuraEnvironment()
-      --if not ok then
-      --  wipe(newPositions)
-      --end
+      if not ok then
+        geterrorhandler()(ret)
+        wipe(newPositions)
+      end
     end
   end
 }
@@ -731,7 +737,10 @@ local function createGrowFunc(data)
 end
 
 local function SafeGetPos(region, func)
-  return func(region)
+  local ok, value1, value2 = pcall(func, region)
+  if ok then
+    return value1, value2
+  end
 end
 
 local function modify(parent, region, data)

WeakAuras/RegionTypes/RegionPrototype.lua

@@ -283,7 +283,10 @@ end
 local function RunCode(self, func)
   if func and not WeakAuras.IsOptionsOpen() then
     WeakAuras.ActivateAuraEnvironment(self.id, self.cloneId, self.state, self.states);
-    xpcall(func, geterrorhandler());
+    local ok, ret = pcall(func);
+    if not ok then
+      geterrorhandler()(ret)
+    end
     WeakAuras.ActivateAuraEnvironment(nil);
   end
 end
@@ -304,7 +307,10 @@ local function UpdatePosition(self)
   local yOffset = self.yOffset + (self.yOffsetAnim or 0) + (self.yOffsetRelative or 0)
   self:RealClearAllPoints();
 
-  self:SetPoint(self.anchorPoint, self.relativeTo, self.relativePoint, xOffset, yOffset);
+  local ok, ret = pcall(self.SetPoint, self, self.anchorPoint, self.relativeTo, self.relativePoint, xOffset, yOffset);
+  if not ok then
+    geterrorhandler()(ret)
+  end
 end
 
 local function ResetPosition(self)