From 0b4f47108a6349cdd2fc95111ff7161fc168a8bb Mon Sep 17 00:00:00 2001
From: NoM0Re <Patrick_S_99@gmx.de>
Date: Thu, 28 Nov 2024 12:52:42 +0100
Subject: [PATCH] (fix/visual) Adjust load options to the correct locations

---
 WeakAuras/Prototypes.lua | 48 ++++++++++++++++++++--------------------
 WeakAuras/WeakAuras.lua  |  4 ++--
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/WeakAuras/Prototypes.lua b/WeakAuras/Prototypes.lua
index 4a37777..faa145d 100644
--- a/WeakAuras/Prototypes.lua
+++ b/WeakAuras/Prototypes.lua
@@ -816,6 +816,13 @@ Private.load_prototype = {
       optional = true,
       events = {"PLAYER_REGEN_DISABLED", "PLAYER_REGEN_ENABLED"}
     },
+    {
+      name = "never",
+      display = L["Never"],
+      type = "toggle",
+      width = WeakAuras.normalWidth,
+      init = "false",
+    },
     {
       name = "alive",
       display = L["Alive"],
@@ -834,13 +841,6 @@ Private.load_prototype = {
       optional = true,
       events = {"PLAYER_FLAGS_CHANGED", "UNIT_FACTION", "ZONE_CHANGED"}
     },
-    {
-      name = "never",
-      display = L["Never"],
-      type = "toggle",
-      width = WeakAuras.normalWidth,
-      init = "false",
-    },
     {
       name = "vehicle",
       display = L["In Vehicle"],
@@ -859,23 +859,6 @@ Private.load_prototype = {
       optional = true,
       events = {"VEHICLE_UPDATE", "UNIT_ENTERED_VEHICLE", "UNIT_EXITED_VEHICLE"}
     },
-    {
-      name = "raid_role",
-      display = L["Raid Role"],
-      type = "multiselect",
-      values = "raid_role_types",
-      init = "arg",
-      events = {"PLAYER_ROLES_ASSIGNED"}
-    },
-    {
-      name = "ingroup",
-      display = L["Group Type"],
-      type = "multiselect",
-      width = WeakAuras.normalWidth,
-      init = "arg",
-      values = "group_types",
-      events = {"PARTY_MEMBERS_CHANGED", "RAID_ROSTER_UPDATE"},
-    },
     {
       name ="playerTitle",
       display = L["Player"],
@@ -995,6 +978,23 @@ Private.load_prototype = {
         limit = 2
       },
     },
+    {
+      name = "raid_role",
+      display = L["Raid Role"],
+      type = "multiselect",
+      values = "raid_role_types",
+      init = "arg",
+      events = {"PLAYER_ROLES_ASSIGNED"}
+    },
+    {
+      name = "ingroup",
+      display = L["Group Type"],
+      type = "multiselect",
+      width = WeakAuras.normalWidth,
+      init = "arg",
+      values = "group_types",
+      events = {"PARTY_MEMBERS_CHANGED", "RAID_ROSTER_UPDATE"},
+    },
     {
       name = "group_leader",
       display = WeakAuras.newFeatureString .. L["Group Leader/Assist"],
diff --git a/WeakAuras/WeakAuras.lua b/WeakAuras/WeakAuras.lua
index c985e65..f086987 100644
--- a/WeakAuras/WeakAuras.lua
+++ b/WeakAuras/WeakAuras.lua
@@ -1363,8 +1363,8 @@ local function scanForLoadsImpl(toCheck, event, arg1, ...)
     if (data and not data.controlledChildren) then
       local loadFunc = loadFuncs[id];
       local loadOpt = loadFuncsForOptions[id];
-      shouldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", inCombat, alive, pvp, vehicle, vehicleUi, raidRole, group, player, realm, class, race, faction, playerLevel, raidMemberType, zone, zoneId, subzone, size, difficulty);
-      couldBeLoaded =  loadOpt and loadOpt("ScanForLoads_Auras",   inCombat, alive, pvp, vehicle, vehicleUi, raidRole, group, player, realm, class, race, faction, playerLevel, raidMemberType, zone, zoneId, subzone, size, difficulty);
+      shouldBeLoaded = loadFunc and loadFunc("ScanForLoads_Auras", inCombat, alive, pvp, vehicle, vehicleUi, player, realm, class, race, faction, playerLevel, raidRole, group, raidMemberType, zone, zoneId, subzone, size, difficulty);
+      couldBeLoaded =  loadOpt and loadOpt("ScanForLoads_Auras",   inCombat, alive, pvp, vehicle, vehicleUi, player, realm, class, race, faction, playerLevel, raidRole, group, raidMemberType, zone, zoneId, subzone, size, difficulty);
 
       if(shouldBeLoaded and not loaded[id]) then
         changed = changed + 1;