From b191a5ce6fa5828ceeaf84633259b54c8ed20c6d Mon Sep 17 00:00:00 2001 From: michaelsp Date: Mon, 11 Mar 2024 23:48:56 +0100 Subject: [PATCH] Added a sanity check to indicators tooltip management code (GH issue #212) Added DAMAGER to role filter in classic era layout editor (GH issue #212) --- Options/modules/general/GridLayoutsEditor.lua | 8 ++++---- modules/IndicatorTooltip.lua | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Options/modules/general/GridLayoutsEditor.lua b/Options/modules/general/GridLayoutsEditor.lua index 73f2f8e1..f78cc0b1 100644 --- a/Options/modules/general/GridLayoutsEditor.lua +++ b/Options/modules/general/GridLayoutsEditor.lua @@ -574,11 +574,11 @@ do descs = { L["Tank"], L["Healer"], L["Dps"], L["None"], L["MainTank"], L["MainAssist"] } widths = { .4, .4, .3, .5, .3, .3, } else - roles = { "MAINTANK", "MAINASSIST", "NONE" } - sroles = "MAINASSIST,MAINTANK,NONE" - names = { L["MainTank"], L["MainAssist"], L["None"] } + roles = { "MAINTANK", "MAINASSIST", "DAMAGER", "NONE" } + sroles = "MAINASSIST,MAINTANK,DAMAGER,NONE" + names = { L["MainTank"], L["MainAssist"], L["Dps"], L["None"] } descs = names - widths = { .75, .75, .75 } + widths = { .6, .6, .4, .4 } end headerOptions.roleheader = { type = "header", order = 40, name = L["Roles"], hidden = IsOptionHiddenNL } for i,role in ipairs(roles) do diff --git a/modules/IndicatorTooltip.lua b/modules/IndicatorTooltip.lua index fef40ae6..7e876f80 100644 --- a/modules/IndicatorTooltip.lua +++ b/modules/IndicatorTooltip.lua @@ -35,7 +35,7 @@ local function TimerEvent() if unit then for indicator, func in next, indicators do local frame = indicator:GetFrame(tooltipFrame) - if frame:IsMouseOver() then + if frame and frame:IsMouseOver() then if frame:IsVisible() then local status, _, extraID, tframe = func(indicator, unit, tooltipFrame, frame) if status and status.GetTooltip then