Skip to content

Commit 543238c

Browse files
Fixed nameplate cinematic mode triggering even if Musician nameplates are disabled
1 parent de9f195 commit 543238c

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

modules/MusicianNamePlates/MusicianNamePlates.lua

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,9 +430,10 @@ function Musician.NamePlates.UpdateNamePlateCinematicMode(namePlate)
430430
if InCombatLockdown() then return end
431431

432432
local UIParentIsVisible = UIParent:IsVisible()
433+
local isCinematicModeEnabled = Musician.NamePlates.AreNamePlatesEnabled() and Musician_Settings.cinematicMode
433434

434435
-- Attach animated notes frame to WorldFrame if hiding nameplates in cinematic mode
435-
if not Musician_Settings.cinematicModeNamePlates and Musician_Settings.cinematicMode then
436+
if not Musician_Settings.cinematicModeNamePlates and isCinematicModeEnabled then
436437
local parent, scale
437438
if not UIParentIsVisible then
438439
parent = WorldFrame
@@ -449,8 +450,8 @@ function Musician.NamePlates.UpdateNamePlateCinematicMode(namePlate)
449450
end
450451

451452
-- Set nameplate visibility
452-
if not Musician_Settings.cinematicModeNamePlates and Musician_Settings.cinematicMode or
453-
not Musician_Settings.cinematicMode then
453+
if not Musician_Settings.cinematicModeNamePlates and isCinematicModeEnabled or
454+
not isCinematicModeEnabled then
454455
if UIParentIsVisible then
455456
namePlate:Show()
456457
else
@@ -664,7 +665,7 @@ end
664665
--- OnSetUIVisibility
665666
-- @param isVisible (boolean)
666667
function Musician.NamePlates.OnSetUIVisibility(isVisible)
667-
if isVisible or not isVisible and Musician_Settings.cinematicMode then
668+
if isVisible or not isVisible and Musician.NamePlates.AreNamePlatesEnabled() and Musician_Settings.cinematicMode then
668669
SetInWorldUIVisibility(true)
669670
end
670671
end

0 commit comments

Comments
 (0)