Mercurial > wow > askmrrobot

diff ui/Ui.lua @ 179:eec8032ba9df v84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
addon should close automatically when entering combat now
author yellowfive
date Thu, 13 Feb 2020 13:21:44 -0800
parents 35612aee8e15
children 5c586ff5fee5
line wrap: on
line diff
--- a/ui/Ui.lua	Sun Jan 26 12:37:26 2020 -0800
+++ b/ui/Ui.lua	Thu Feb 13 13:21:44 2020 -0800
@@ -351,6 +351,8 @@
 function Amr:Show()
 	if not self:IsEnabled() then return end
 	
+	if InCombatLockdown() then return end
+
 	if _mainFrame then 
 		_mainFrame:Show()
 	else	
@@ -367,6 +369,7 @@
 	Amr:Hide()
 	--Amr:HideLootWindow()
 	Amr:HideShopWindow()
+	Amr:HideJunkWindow()
 	Amr.db.profile.options.uiScale = 1
 	Amr.db.profile.window = {}
 	Amr.db.profile.lootWindow = {}