From d31e9833f9fb477c7ad512732fb8c8ce69a0b70b Mon Sep 17 00:00:00 2001
From: def <dennis@felsin9.de>
Date: Mon, 25 Mar 2019 20:01:10 +0100
Subject: [PATCH] Escape during popup: Only make popup disappear

Not the menu. Otherwise when opening the menu again the popup will
reappear for one frame before disappearing.
---
 src/game/client/components/menus.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index 1e0b5c011..ba3902e9a 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -1733,7 +1733,8 @@ bool CMenus::OnInput(IInput::CEvent e)
 		if(e.m_Key == KEY_ESCAPE)
 		{
 			m_EscapePressed = true;
-			SetActive(!IsActive());
+			if(m_Popup == POPUP_NONE)
+				SetActive(!IsActive());
 			return true;
 		}
 	}