Fix error with talent tree

WeakAuras · Oct 26, 2022 · 8e4c42d · 8e4c42d
1 parent a74957d
commit 8e4c42d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 18 deletions.
diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
@@ -1314,7 +1314,7 @@ Private.load_prototype = {
       end,
       multiConvertKey = WeakAuras.IsDragonflight() and function(trigger, key)
         local specId = Private.checkForSingleLoadCondition(trigger, "class_and_spec")
-        if specId and type(Private.talentInfo[specId]) == "table" then
+        if specId and type(Private.talentInfo[specId]) == "table" and Private.talentInfo[specId][key] then
           return Private.talentInfo[specId][key][2]
         end
       end or nil,
@@ -1374,7 +1374,7 @@ Private.load_prototype = {
       end,
       multiConvertKey = WeakAuras.IsDragonflight() and function(trigger, key)
         local specId = Private.checkForSingleLoadCondition(trigger, "class_and_spec")
-        if specId and type(Private.talentInfo[specId]) == "table" then
+        if specId and type(Private.talentInfo[specId]) == "table" and Private.talentInfo[specId][key] then
           return Private.talentInfo[specId][key][2]
         end
       end or nil,
@@ -1436,7 +1436,7 @@ Private.load_prototype = {
       end,
       multiConvertKey = WeakAuras.IsDragonflight() and function(trigger, key)
         local specId = Private.checkForSingleLoadCondition(trigger, "class_and_spec")
-        if specId and type(Private.talentInfo[specId]) == "table" then
+        if specId and type(Private.talentInfo[specId]) == "table" and Private.talentInfo[specId][key] then
           return Private.talentInfo[specId][key][2]
         end
       end or nil,

diff --git a/WeakAurasOptions/LoadOptions.lua b/WeakAurasOptions/LoadOptions.lua
@@ -815,28 +815,32 @@ function OptionsPrivate.ConstructOptions(prototype, data, startorder, triggernum
               if arg.multiConvertKey then
                 v = arg.multiConvertKey(trigger, v)
               end
-              return trigger[realname].multi[v];
+              if v then
+                return trigger[realname].multi[v];
+              end
             end
           end,
           set = function(info, v, calledFromSetAll)
             if arg.multiConvertKey then
               v = arg.multiConvertKey(trigger, v)
             end
-            trigger[realname].multi = trigger[realname].multi or {};
-            if (calledFromSetAll or arg.multiTristate) then
-              trigger[realname].multi[v] = calledFromSetAll;
-            elseif(trigger[realname].multi[v]) then
-              trigger[realname].multi[v] = nil;
-            else
-              trigger[realname].multi[v] = true;
-            end
-            WeakAuras.Add(data);
-            if (reloadOptions) then
-              WeakAuras.ClearAndUpdateOptions(data.id)
+            if v then
+              trigger[realname].multi = trigger[realname].multi or {};
+              if (calledFromSetAll or arg.multiTristate) then
+                trigger[realname].multi[v] = calledFromSetAll;
+              elseif(trigger[realname].multi[v]) then
+                trigger[realname].multi[v] = nil;
+              else
+                trigger[realname].multi[v] = true;
+              end
+              WeakAuras.Add(data);
+              if (reloadOptions) then
+                WeakAuras.ClearAndUpdateOptions(data.id)
+              end
+              OptionsPrivate.Private.ScanForLoads({[data.id] = true});
+              WeakAuras.UpdateThumbnail(data);
+              OptionsPrivate.SortDisplayButtons(nil, true);
             end
-            OptionsPrivate.Private.ScanForLoads({[data.id] = true});
-            WeakAuras.UpdateThumbnail(data);
-            OptionsPrivate.SortDisplayButtons(nil, true);
           end
         };
         if(arg.required and not triggertype) then