Stan/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Fixes hotkey bugs introduced in a07add11c6, patch by elexis. Fixes #3495

Browse Source 
This was SVN commit r17116.
This commit is contained in:
historic_bruno 2015-10-10 07:22:07 +00:00
parent 02628b8902
commit 40acf66ba9
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/ps/Hotkey.cpp
View File

@ -299,7 +299,11 @@ InReaction HotkeyInputHandler(const SDL_Event_* ev)
// Check for no unpermitted keys
bool accept = true;
for (const SKey& k : hotkey.requires)
{
accept = isNegated(k);
if (!accept)
break;
}
if (accept && !(consoleCapture && hotkey.name != "console.toggle"))
{
@ -341,7 +345,11 @@ InReaction HotkeyInputHandler(const SDL_Event_* ev)
// Check for no unpermitted keys
bool accept = true;
for (const SKey& k : hotkey.requires)
{
accept = isNegated(k);
if (!accept)
break;
}
if (accept)
{