summaryrefslogtreecommitdiff
path: root/src/input
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2017-09-11 18:10:33 +0300
committerAndrei Karas <akaras@inbox.ru>2017-09-11 18:10:33 +0300
commit9cf6f58fa6171daff4568963c79a6338e7b54c8c (patch)
tree15509873f29419c7c98b28ba121db22856762a3b /src/input
parentae63537b71186b08dfac9604be901032bcf7f190 (diff)
downloadplus-9cf6f58fa6171daff4568963c79a6338e7b54c8c.tar.gz
plus-9cf6f58fa6171daff4568963c79a6338e7b54c8c.tar.bz2
plus-9cf6f58fa6171daff4568963c79a6338e7b54c8c.tar.xz
plus-9cf6f58fa6171daff4568963c79a6338e7b54c8c.zip
Fix ignoring "ignore" keys in SDL 2 builds.
Diffstat (limited to 'src/input')
-rw-r--r--src/input/inputmanager.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/input/inputmanager.cpp b/src/input/inputmanager.cpp
index cf8c75cd6..d141875b8 100644
--- a/src/input/inputmanager.cpp
+++ b/src/input/inputmanager.cpp
@@ -694,6 +694,12 @@ bool InputManager::handleEvent(const SDL_Event &restrict event) restrict2
{
case SDL_KEYDOWN:
case SDL_KEYUP:
+ if (isActionActive(InputAction::IGNORE_INPUT_1) ||
+ isActionActive(InputAction::IGNORE_INPUT_2))
+ {
+ BLOCK_END("InputManager::handleEvent")
+ return true;
+ }
if (triggerAction(keyboard.getActionVector(event)))
{
BLOCK_END("InputManager::handleEvent")