From 8a44abbcf3bb84e87117dab81ee2121ef5a129c7 Mon Sep 17 00:00:00 2001 From: Aljoscha Schmidt Date: Thu, 3 Oct 2019 19:05:47 +0200 Subject: [PATCH] -removed who lib's /who command to let the standard interface handle this correctly for us --- CensusPlusClassic.lua | 2 +- libs/LibWho-2.0/LibWho-2.0.lua | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CensusPlusClassic.lua b/CensusPlusClassic.lua index 797408e..e2cd099 100644 --- a/CensusPlusClassic.lua +++ b/CensusPlusClassic.lua @@ -2414,6 +2414,7 @@ function CensusPlus_ProcessWhoResults(result, numWhoResults) local tmpGldend = nil local relationship = nil if (CensusPlus_WHOPROCESSOR == CP_libwho) then + if (result[i] == nil) then return end name = result[i].Name realm = CensusPlus_GetUniqueRealmName() guild = result[i].Guild @@ -3598,7 +3599,6 @@ function ManualWho() }) WhoFrameEditBox:SetText(whoMsg) WhoFrameWhoButton:Click() - WhoFrame:GetParent():Hide() end end end diff --git a/libs/LibWho-2.0/LibWho-2.0.lua b/libs/LibWho-2.0/LibWho-2.0.lua index a068bd7..40b96a8 100644 --- a/libs/LibWho-2.0/LibWho-2.0.lua +++ b/libs/LibWho-2.0/LibWho-2.0.lua @@ -755,19 +755,19 @@ end --- slash commands --- -SlashCmdList['WHO'] = function(msg) - dbg("console /who: "..msg) - -- new /who function - --local self = lib - - if(msg == '')then - lib:GuiWho(WhoFrame_GetDefaultWhoCommand()) - elseif(WhoFrame:IsVisible())then - lib:GuiWho(msg) - else - lib:ConsoleWho(msg) - end -end +--SlashCmdList['WHO'] = function(msg) +-- dbg("console /who: "..msg) +-- -- new /who function +-- --local self = lib +-- +-- if(msg == '')then +-- lib:GuiWho(WhoFrame_GetDefaultWhoCommand()) +-- elseif(WhoFrame:IsVisible())then +-- lib:GuiWho(msg) +-- else +-- lib:ConsoleWho(msg) +-- end +--end SlashCmdList['WHOLIB_DEBUG'] = function() -- /wholibdebug: toggle debug on/off @@ -918,8 +918,8 @@ FriendsFrame:UnregisterEvent("WHO_LIST_UPDATE") function lib:WHO_LIST_UPDATE() if not lib.Quiet then - WhoList_Update() - FriendsFrame_Update() + WhoList_Update() + FriendsFrame_Update() end lib:ProcessWhoResults()