forked from 0ad/0ad
Fixes hotkey bugs introduced in a07add11c6
, patch by elexis. Fixes #3495
This was SVN commit r17116.
This commit is contained in:
parent
02628b8902
commit
40acf66ba9
@ -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)
|
||||
{
|
||||
|
Loading…
Reference in New Issue
Block a user