NP: prevent ZNP init if Elvui Nameplates are disabled

Zidras · Nov 13, 2024 · 24f777a · 24f777a
1 parent e51d211
commit 24f777a
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/ElvUI_ProjectZidras/Modules/Nameplates/Nameplates.lua b/ElvUI_ProjectZidras/Modules/Nameplates/Nameplates.lua
@@ -493,16 +493,16 @@ function ZNP:UpdateAllSettings()
 end
 
 function ZNP:Initialize()
-	if NP.Initialized then
-		self:UpdateAllSettings()
+	if not NP.Initialized then return end
 
-		if E.db.pz.nameplates.hdClient.hdNameplates then
-			UpdateCVarsHook(NP) -- update once since we cannot hook it in time on NP:Initialize.
-		end
+	self:UpdateAllSettings()
 
-		hooksecurefunc(NP, "SetMouseoverFrame", restoreNameplateUnitAfterMouseover) -- this is needed to hotfix ElvUI behaviour that clears frame.unit on all mouseover losses, so always hook it
+	if E.db.pz.nameplates.hdClient.hdNameplates then
+		UpdateCVarsHook(NP) -- update once since we cannot hook it in time on NP:Initialize.
 	end
 
+	hooksecurefunc(NP, "SetMouseoverFrame", restoreNameplateUnitAfterMouseover) -- this is needed to hotfix ElvUI behaviour that clears frame.unit on all mouseover losses, so always hook it
+
 	self:RegisterEvent("COMBAT_LOG_EVENT_UNFILTERED")
 	self:RegisterEvent("PLAYER_TARGET_CHANGED")
 	self:RegisterEvent("UPDATE_MOUSEOVER_UNIT")