Mercurial > wow > askmrrobot

diff Junk.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 f27a7c64b21f
children a7f2ba17c39a
line wrap: on
line diff
--- a/Junk.lua	Sun Jan 26 12:37:26 2020 -0800
+++ b/Junk.lua	Thu Feb 13 13:21:44 2020 -0800
@@ -288,6 +288,8 @@
 
 function Amr:ShowJunkWindow()
 
+    if InCombatLockdown() then return end
+    
 	if not _frameJunk then
 		_frameJunk = AceGUI:Create("AmrUiFrame")
 		_frameJunk:SetStatusTable(Amr.db.profile.junkWindow) -- window position is remembered in db