From 9d8f4960b755f7f6e85d4c8d7a21801782de5cf8 Mon Sep 17 00:00:00 2001
From: Bunny67 <zolov6767@gmail.com>
Date: Sun, 30 Aug 2020 10:35:07 +0300
Subject: [PATCH] from retail

---
 WeakAuras/RegionTypes/AuraBar.lua             |  2 +-
 WeakAurasOptions/LoadOptions.lua              |  2 +-
 .../SubRegionOptions/SubRegionCommon.lua      | 21 ++++++++++++-------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/WeakAuras/RegionTypes/AuraBar.lua b/WeakAuras/RegionTypes/AuraBar.lua
index 0226e63..8e20658 100644
--- a/WeakAuras/RegionTypes/AuraBar.lua
+++ b/WeakAuras/RegionTypes/AuraBar.lua
@@ -320,7 +320,7 @@ local barPrototype = {
 
         if (additionalBar.min and additionalBar.max) then
           if (valueWidth ~= 0) then
-            startProgress = max( (additionalBar.min - valueStart) / valueWidth, 0);
+            startProgress = (additionalBar.min - valueStart) / valueWidth;
             endProgress = (additionalBar.max - valueStart) / valueWidth;
 
             if (self.additionalBarsInverse) then
diff --git a/WeakAurasOptions/LoadOptions.lua b/WeakAurasOptions/LoadOptions.lua
index 9e116e9..f9bdf14 100644
--- a/WeakAurasOptions/LoadOptions.lua
+++ b/WeakAurasOptions/LoadOptions.lua
@@ -269,7 +269,7 @@ function WeakAuras.ConstructOptions(prototype, data, startorder, triggernum, tri
             name = L["Operator"],
             order = order,
             hidden = hidden,
-            values = arg.operator_types_without_equal and operator_types_without_equal or operator_types,
+            values = arg.operator_types == "without_equal" and operator_types_without_equal or operator_types,
             disabled = function() return not trigger["use_"..realname]; end,
             get = function() return trigger["use_"..realname] and trigger[realname.."_operator"] or nil; end,
             set = function(info, v)
diff --git a/WeakAurasOptions/SubRegionOptions/SubRegionCommon.lua b/WeakAurasOptions/SubRegionOptions/SubRegionCommon.lua
index 5cf7636..888112a 100644
--- a/WeakAurasOptions/SubRegionOptions/SubRegionCommon.lua
+++ b/WeakAurasOptions/SubRegionOptions/SubRegionCommon.lua
@@ -28,8 +28,6 @@ function WeakAuras.DeleteSubRegion(data, index, regionType)
   end
   if data.subRegions[index] and data.subRegions[index].type == regionType then
     tremove(data.subRegions, index)
-    WeakAuras.Add(data)
-    WeakAuras.ClearAndUpdateOptions(data.id)
 
     local replacements = {
       ["sub." .. index .. "."] = deleteCondition
@@ -40,6 +38,9 @@ function WeakAuras.DeleteSubRegion(data, index, regionType)
     end
 
     AdjustConditions(data, replacements);
+
+    WeakAuras.Add(data)
+    WeakAuras.ClearAndUpdateOptions(data.id)
   end
 end
 
@@ -49,8 +50,6 @@ function WeakAuras.MoveSubRegionUp(data, index, regionType)
   end
   if data.subRegions[index] and data.subRegions[index].type == regionType then
     data.subRegions[index - 1], data.subRegions[index] = data.subRegions[index], data.subRegions[index - 1]
-    WeakAuras.Add(data)
-    WeakAuras.ClearAndUpdateOptions(data.id)
 
     local replacements = {
       ["sub." .. (index -1) .. "."] = "sub." .. index .. ".",
@@ -58,6 +57,9 @@ function WeakAuras.MoveSubRegionUp(data, index, regionType)
     }
 
     AdjustConditions(data, replacements);
+
+    WeakAuras.Add(data)
+    WeakAuras.ClearAndUpdateOptions(data.id)
   end
 end
 
@@ -67,8 +69,6 @@ function WeakAuras.MoveSubRegionDown(data, index, regionType)
   end
   if data.subRegions[index] and data.subRegions[index].type == regionType and data.subRegions[index + 1] then
     data.subRegions[index], data.subRegions[index + 1] = data.subRegions[index + 1], data.subRegions[index]
-    WeakAuras.Add(data)
-    WeakAuras.ClearAndUpdateOptions(data.id)
 
     local replacements = {
       ["sub." .. index .. "."] = "sub." .. (index + 1) .. ".",
@@ -76,6 +76,9 @@ function WeakAuras.MoveSubRegionDown(data, index, regionType)
     }
 
     AdjustConditions(data, replacements);
+
+    WeakAuras.Add(data)
+    WeakAuras.ClearAndUpdateOptions(data.id)
   end
 end
 
@@ -85,13 +88,15 @@ function WeakAuras.DuplicateSubRegion(data, index, regionType)
   end
   if data.subRegions[index] and data.subRegions[index].type == regionType then
     tinsert(data.subRegions, index, CopyTable(data.subRegions[index]))
-    WeakAuras.Add(data)
-    WeakAuras.ClearAndUpdateOptions(data.id)
+
 
     local replacements = {}
     for i = index + 1, #data.subRegions do
       replacements["sub." .. i .. "."] = "sub." .. (i + 1) .. "."
     end
     AdjustConditions(data, replacements);
+
+    WeakAuras.Add(data)
+    WeakAuras.ClearAndUpdateOptions(data.id)
   end
 end