edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 10:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1539 from def-/pr-esc-popup

Browse source 
Escape during popup: Only make popup disappear
This commit is contained in:
Dennis Felsing 2019-03-28 23:38:00 +01:00 committed by GitHub
parent 11fee99b9c d31e9833f9
commit 72200a4e09
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/client/components/menus.cpp
View file

@ -1749,7 +1749,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;
}
}