From f41d545585f305881fe73441fe8af261c6f4cefc Mon Sep 17 00:00:00 2001 From: Noshei <8866000+Noshei@users.noreply.github.com> Date: Wed, 23 Oct 2024 11:05:51 -0600 Subject: [PATCH] 2.6.4 Fixed error when entering follower dungeons with session data displayed --- GatheringTracker.lua | 9 ++++++--- GatheringTracker.toc | 5 +++-- Utilities.lua | 8 ++++++++ 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/GatheringTracker.lua b/GatheringTracker.lua index 475bd0f..32d6ec8 100644 --- a/GatheringTracker.lua +++ b/GatheringTracker.lua @@ -380,6 +380,9 @@ function GT:AllignColumns() end for i, id in ipairs(GT.Display.Order) do for index, string in ipairs(GT.Display.Frames[id].text) do + if not GT.Display.ColumnSize[index] then + GT:CheckColumnSize(index, GT.Display.Frames[id].text[index]) + end string:SetWidth(GT.Display.ColumnSize[index]) end end @@ -626,7 +629,7 @@ function GT:GetItemRowData(itemID) if GT.db.profile.General.sessionOnly then GT.Debug("GetItemRowData", 3, "Session Counts", itemID) return GT.InventoryData[itemID].sessionCounts - elseif GT.db.profile.General.sessionItems and not IsInGroup() then + elseif GT.db.profile.General.sessionItems and not GT:IsInGroup() then local data = {} for playerIndex, count in ipairs(GT.InventoryData[itemID].counts) do table.insert(data, count) @@ -695,7 +698,7 @@ function GT:SetupTotalsRow() GT.db.profile.General.sessionOnly ) table.insert(playerTotals, playerTotal) - if GT.db.profile.General.sessionItems and not GT.db.profile.General.sessionOnly and not IsInGroup() then + if GT.db.profile.General.sessionItems and not GT.db.profile.General.sessionOnly and not GT:IsInGroup() then local playerTotalSession, playerPriceSession = GT:CalculatePlayerTotals( senderIndex, true, @@ -863,7 +866,7 @@ function GT:InventoryUpdate(event, wait) GT:ProcessSoloData(event) - if GT.db.profile.General.groupType > 0 and IsInGroup() then + if GT.db.profile.General.groupType > 0 and GT:IsInGroup() then GT:CreateDataMessage(event) end end diff --git a/GatheringTracker.toc b/GatheringTracker.toc index 803793e..e20a7c8 100644 --- a/GatheringTracker.toc +++ b/GatheringTracker.toc @@ -1,8 +1,8 @@ -## Interface: 110002 +## Interface: 110005 ## Title: Gathering Tracker ## Notes: Addon for tracking gathered items, supports solo players and groups ## Author: Noshei -## Version: 2.6.3 +## Version: 2.6.4 ## OptionalDeps: TradeSkillMaster, RECrystallize, Auctionator ## SavedVariables: GatheringTrackerDB ## AddonCompartmentFunc: GatheringTracker_OnAddonCompartmentClick @@ -15,6 +15,7 @@ DisplayCollapse.lua Utilities.lua FilterButton.lua NotificationHandler.lua +Alerts.lua Constants.lua Config.lua Broker.lua diff --git a/Utilities.lua b/Utilities.lua index 21c4329..4b7efa1 100644 --- a/Utilities.lua +++ b/Utilities.lua @@ -168,6 +168,14 @@ function GT:GroupDisplayCheck() return true end +function GT:IsInGroup() + -- Extention of IsInGroup to return false when in follower dungeons + if C_LFGInfo.IsInLFGFollowerDungeon() == true then + return false + end + return IsInGroup() +end + function GT:SetChatType() local soloMode = GT.db.profile.General.groupType == 0 or GT.db.profile.General.groupType == 2 local groupMode = GT.db.profile.General.groupType > 0