Fix issue #257

IrcDirk · Nov 6, 2022 · b40662d · b40662d
1 parent 7f51d49
commit b40662d
Showing 1 changed file with 7 additions and 53 deletions.
diff --git a/Carbonite.Quests/NxQuest.lua b/Carbonite.Quests/NxQuest.lua
@@ -2846,60 +2846,13 @@ function Nx.Quest:Init()
 		["Erratic Sentry"] = "Erratic Sentries",
 	}
 
-	--hooksecurefunc ("ShowUIPanel", CarboniteQuest.ShowUIPanel)
-	--hooksecurefunc ("HideUIPanel", CarboniteQuest.HideUIPanel)
-	--[[hooksecurefunc ("ToggleQuestLog", function(...)
-		Nx.Map.WMFOnShow = false
-		local orig = IsAltKeyDown() and not self.IgnoreAlt
-		if Nx.qdb.profile.Quest.UseAltLKey then
-			orig = not orig
-		end
-		if not orig then
-			
-		end
-		Nx.Map.WMFOnShow = truel
-	end)]]--
-	Nx.Quest.OldToggleQuestLog = ToggleQuestLog
-	function ToggleQuestLog(...)
-		Nx.Map.WMFOnShow = false
-		local orig = IsAltKeyDown() and not self.IgnoreAlt
-		if Nx.qdb.profile.Quest.UseAltLKey then
-			orig = not orig
-		end
-		if orig then
-			--WorldMapFrame:SetQuestLogPanelShown(true)
-			Nx.Quest:OldToggleQuestLog()
-		else
-			if self.InShowUIPanel then
-				Nx.Quest:HideUIPanel(QuestMapFrame)
-				self.InShowUIPanel = false
-			else
-				Nx.Quest:ShowUIPanel(QuestMapFrame)
-				self.InShowUIPanel = true
-			end
-		end	
-		Nx.Map.WMFOnShow = true
-	end
-	--[[Nx.Quest.OldWindow = ToggleQuestLog
-	function ToggleQuestLog(...)
-		local orig = IsAltKeyDown() and not self.IgnoreAlt
+	local func = function ()
+		local testAlt = IsAltKeyDown() and not self.IgnoreAlt
 		if Nx.qdb.profile.Quest.UseAltLKey then
-			orig = not orig
+			testAlt = not testAlt
 		end
-		if orig then
-			Nx.Map.WMFOnShow = false
-			self.IsOrigOpen = WorldMapFrame:IsShown()
-			if self.IsOrigOpen then
-				HideUIPanel(WorldMapFrame)
-			else
-				QuestMapFrame_Open(true)
-				OpenQuestLog()
-			end
-			Nx.Map.WMFOnShow = true
-		else
-			--if self.IsOpen then
-			--	self.IsOpen = QuestMapFrame:IsShown()
-			--end
+		if not testAlt then 
+			QuestLogFrame:Hide()
 			if self.InShowUIPanel then
 				Nx.Quest:HideUIPanel(QuestMapFrame)
 				self.InShowUIPanel = false
@@ -2908,7 +2861,8 @@ function Nx.Quest:Init()
 				self.InShowUIPanel = true
 			end
 		end
-	end]]--
+	end
+	QuestLogFrame:HookScript ("OnShow", func)
 end
 
 -------