Fix spell fields focus for non-aura triggers and load options

WeakAuras · Sep 6, 2023 · 1be2ace · 1be2ace
1 parent 99f7da4
commit 1be2ace
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/WeakAurasOptions/LoadOptions.lua b/WeakAurasOptions/LoadOptions.lua
@@ -584,7 +584,7 @@ function OptionsPrivate.ConstructOptions(prototype, data, startorder, triggernum
                     return name;
                   end
                 end
-                return useExactSpellId and L["Invalid Item ID"] or L["Invalid Item Name/ID/Link"];
+                return (useExactSpellId and L["Invalid Item ID"] or L["Invalid Item Name/ID/Link"]) .. "\0"
               else
                 return nil;
               end
@@ -597,12 +597,12 @@ function OptionsPrivate.ConstructOptions(prototype, data, startorder, triggernum
                     if arg.negativeIsEJ and WeakAuras.IsRetail() and spellID < 0 then
                       local tbl = C_EncounterJournal.GetSectionInfo(-spellID)
                       if tbl and tbl.title then
-                        return ("%s (%s)"):format(spellID, tbl.title)
+                        return ("%s (%s)"):format(spellID, tbl.title) .. "\0" .. (trigger[realname] or "")
                       end
                     end
                     local spellName = GetSpellInfo(WeakAuras.SafeToNumber(trigger[realname]))
                     if spellName then
-                      return ("%s (%s)"):format(spellID, spellName)
+                      return ("%s (%s)"):format(spellID, spellName) .. "\0" .. (trigger[realname] or "")
                     end
                   elseif not useExactSpellId then
                     local spellName = GetSpellInfo(trigger[realname])
@@ -614,7 +614,7 @@ function OptionsPrivate.ConstructOptions(prototype, data, startorder, triggernum
                 if arg.noValidation then
                   return trigger[realname]
                 end
-                return useExactSpellId and L["Invalid Spell ID"] or L["Invalid Spell Name/ID/Link"];
+                return (useExactSpellId and L["Invalid Spell ID"] or L["Invalid Spell Name/ID/Link"]) .. "\0"
               else
                 return nil;
               end