Merge branch 'master' into mop

diff --git a/SummonManager.lua b/SummonManager.lua
index 4e8c28c..380f825 100644
--- a/SummonManager.lua
+++ b/SummonManager.lua
@@ -146,7 +146,7 @@ function SM:DeclineSummon()
 end

 function SM:HasSummon()
-	return GetSummonConfirmTimeLeft() > 0
+	return GetSummonConfirmTimeLeft() > 0 and StaticPopup_Visible("CONFIRM_SUMMON")
 end

 function SM:IsEnabled()