from retail

WeakAurasOptions/ConditionOptions.lua

@@ -1797,7 +1797,7 @@ end
 
 local function addControlsForCondition(args, order, data, conditionVariable, conditions, i, conditionTemplates, conditionTemplateWithoutCombinations, allProperties)
   if (not conditions[i].check) then
-    return;
+    return order;
   end
 
   local defaultCollapsed = #conditions > 2
@@ -2537,6 +2537,13 @@ local function mergeConditions(all, aura, id, allConditionTemplates, propertyTyp
   end
 end
 
+local fixupConditions = function(conditions)
+  for index, condition in ipairs(conditions) do
+    condition.check = condition.check or {}
+    condition.changes = condition.changes or {}
+  end
+end
+
 function OptionsPrivate.GetConditionOptions(data)
   local  options = {
     type = "group",
@@ -2564,11 +2571,13 @@ function OptionsPrivate.GetConditionOptions(data)
     for index = last, 1, -1 do
       local id = data.controlledChildren[index];
       local data = WeakAuras.GetData(id);
+      fixupConditions(data[conditionVariable])
       mergeConditions(conditions, data[conditionVariable], data.id, conditionTemplates.all, allProperties);
     end
   else
     data[conditionVariable] = data[conditionVariable] or {};
     conditions = data[conditionVariable];
+    fixupConditions(data[conditionVariable])
   end
 
   local order = startorder;