fix tooltip m+ lua error

Mortalknight · Apr 3, 2024 · cad4a68 · cad4a68
1 parent 8864ac4
commit cad4a68
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,3 +1,7 @@
+6.14.4
+FIXES
+    - Tooltip M+ lua error
+
 6.14.3
 FIXES
     - Party visibility

diff --git a/CHANGELOG_NEW_VERSION.txt b/CHANGELOG_NEW_VERSION.txt
@@ -1,3 +1,7 @@
+6.14.4
+FIXES
+    - Tooltip M+ lua error
+
 6.14.3
 FIXES
     - Party visibility

diff --git a/changelog.lua b/changelog.lua
@@ -15,6 +15,9 @@ AddChange(string addonVersion, table changeList)
   }
 ]]
 
+addChange("6.14.4",{
+    {ct.bug, [=[Tooltip M+ lua error]=]},
+})
 
 addChange("6.14.3",{
     {ct.bug, [=[Party visibility]=]},

diff --git a/immersive/chatframe.lua b/immersive/chatframe.lua
@@ -797,12 +797,7 @@ local function AddMessage(self, msg, infoR, infoG, infoB, infoID, accessID, type
 end
 
 -- copied from ChatFrame.lua
-local function GetPFlag(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17)
-    -- Renaming for clarity:
-    local specialFlag = arg6
-    local zoneChannelID = arg7
-    --local localChannelID = arg8
-
+local function GetPFlag(specialFlag, zoneChannelID, localChannelID)
     if specialFlag ~= "" then
         if specialFlag == "GM" or specialFlag == "DEV" then
             -- Add Blizzard Icon if this was sent by a GM/DEV
@@ -950,7 +945,7 @@ local function MessageFormatter(frame, info, chatType, chatGroup, chatTarget, ch
     end
 
     -- Player Flags
-    local pflag = GetPFlag(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, arg11, arg12, arg13, arg14, arg15, arg16, arg17)
+    local pflag = GetPFlag(arg6, arg7, arg8)
 
     -- LFG Role Flags
     local lfgRole = (chatType == "PARTY_LEADER" or chatType == "PARTY" or chatType == "RAID" or chatType == 'RAID_LEADER' or chatType == 'INSTANCE_CHAT' or chatType == 'INSTANCE_CHAT_LEADER') and lfgRoles[playerName]

diff --git a/immersive/skins/encounterJournal.lua b/immersive/skins/encounterJournal.lua
@@ -245,6 +245,7 @@ local function encounterJournalSkin()
     InstanceSelect.tierDropDown:GwSkinDropDownMenu()
     EncounterJournalInstanceSelectBG:SetAlpha(0)
     EncounterJournalMonthlyActivitiesFrame.Bg:SetAlpha(0)
+    EncounterJournalMonthlyActivitiesFrame.MonthlyActivitiesFrame.ThemeContainer:SetAlpha(0)
     GW.HandleTrimScrollBar(EncounterJournalMonthlyActivitiesFrame.ScrollBar, true)
     GW.HandleScrollControls(EncounterJournalMonthlyActivitiesFrame)
 

diff --git a/immersive/skins/perksProgram.lua b/immersive/skins/perksProgram.lua
@@ -20,6 +20,8 @@ end
 local function SkinPerksProgram()
     if not GW.settings.PERK_PROGRAM_SKIN_ENABLED then return end
 
+    PerksProgramFrame.ThemeContainer:SetAlpha(0)
+
     if PerksProgramFrame.ProductsFrame then
         PerksProgramFrame.ProductsFrame.PerksProgramFilter.FilterDropDownButton:GwSkinButton(false, true)
         PerksProgramFrame.ProductsFrame.PerksProgramCurrencyFrame.Text:SetFont("UNIT_NAME_FONT", 30)

diff --git a/immersive/tooltips.lua b/immersive/tooltips.lua
@@ -539,6 +539,7 @@ local function AddMythicInfo(self, unit)
     local data = C_PlayerInfo.GetPlayerMythicPlusRatingSummary(unit)
     if data and data.currentSeasonScore and data.currentSeasonScore > 0 then
         local color = C_ChallengeMode.GetDungeonScoreRarityColor(data.currentSeasonScore)
+        if not color or color == nil then color = {} end
 
         self:AddDoubleLine(DUNGEON_SCORE_LEADER:format("@"):gsub(": @", ""), GW.CommaValue(data.currentSeasonScore), nil, nil, nil, color.r or 1, color.g or 1, color.b or 1)
     end