unload the groupbrowser module, since it was replaced with RDF

Gogo1951 · Dec 4, 2023 · 97cea8d · 97cea8d
1 parent 24b3dad
commit 97cea8d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Core.lua b/Core.lua
@@ -1129,7 +1129,7 @@ end
 local function BuildGroupieWindow()
     if GroupieFrame ~= nil then
         addon.ExpireListings()
-        local GroupieGroupBrowser = Groupie:GetModule("GroupieGroupBrowser")
+        local GroupieGroupBrowser = Groupie:GetModule("GroupieGroupBrowser",true)
         if GroupieGroupBrowser then
             GroupieGroupBrowser:AttachLFGToolPreset(GroupieTab1, 2)
             GroupieGroupBrowser:AttachLFGToolPreset(GroupieTab2, 2)
@@ -3221,7 +3221,7 @@ function addon:OnEnable()
         if isInitialLogin == true then
             C_Timer.After(15, function()
                 addon.UpdateCharacterSheet()
-                local GroupieGroupBrowser = Groupie:GetModule("GroupieGroupBrowser")
+                local GroupieGroupBrowser = Groupie:GetModule("GroupieGroupBrowser",true)
                 if GroupieGroupBrowser then
                     --Queue updates from the LFG tool for dungeons and raids on login
                     local dungeons, dungeonactivities = GroupieGroupBrowser:GetActivitiesFor(2)

diff --git a/Groupie.toc b/Groupie.toc
@@ -1,7 +1,7 @@
-## Interface: 30402
+## Interface: 30403
 ## Title: Groupie
 ## Notes: A better LFG tool for Classic WoW.
-## Version: 1.73
+## Version: 1.74-alpha
 ## Author: Gogo, LemonDrake, Kynura, Raegen
 ## SavedVariables: GroupieDB
 ## X-Curse-Project-ID: 661450
@@ -18,7 +18,7 @@ DBs/AchievementData.lua
 DBs/InstanceData.lua
 Globals.lua
 Core.lua
-GroupBrowser.lua
+#GroupBrowser.lua
 RightClick.lua
 Listener.lua
 AutoResponse.lua

diff --git a/RightClick.lua b/RightClick.lua
@@ -189,12 +189,12 @@ end
 ---------------
 local function GroupieUnitMenu(dropdownMenu, which, unit, name, userData, ...)
 
-	if (UIDROPDOWNMENU_MENU_LEVEL > 1) then
+	--Attempt to prevent taint by not hooking dropdown while in combat
+	if InCombatLockdown() then
 		return
 	end
 
-	--Attempt to prevent taint by not hooking dropdown while in combat
-	if InCombatLockdown() then
+	if (UIDROPDOWNMENU_MENU_LEVEL > 1) or (which ~= "PLAYER") then
 		return
 	end
 
@@ -209,7 +209,7 @@ local function GroupieUnitMenu(dropdownMenu, which, unit, name, userData, ...)
 	end
 
 	--Dont show the menu on the player's own frame if not in debug mode
-	if unit == "player" and not addon.debugMenus then
+	if UnitIsUnit(unit,"player") and not addon.debugMenus then
 		return
 	end
 	if myname == name and not addon.debugMenus then