diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-01-18 20:02:27 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-01-18 20:02:27 +0300 |
| commit | fb5d0e7762f692948dddebd3deb38a0bd20de5f2 (patch) | |
| tree | afe2c0d8cf75738fd847af37dc166e0c338f7493 /src/touchactions.cpp | |
| parent | 8a5603e487f682f5f67bc2cedae81249aa138f5b (diff) | |
| parent | e9e343366fbfbe9a6343089ff113354524f3f306 (diff) | |
| download | plus-fb5d0e7762f692948dddebd3deb38a0bd20de5f2.tar.gz plus-fb5d0e7762f692948dddebd3deb38a0bd20de5f2.tar.bz2 plus-fb5d0e7762f692948dddebd3deb38a0bd20de5f2.tar.xz plus-fb5d0e7762f692948dddebd3deb38a0bd20de5f2.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/touchactions.cpp')
| -rw-r--r-- | src/touchactions.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/touchactions.cpp b/src/touchactions.cpp index 1b6abdf23..a79c14275 100644 --- a/src/touchactions.cpp +++ b/src/touchactions.cpp @@ -23,6 +23,8 @@ #include "mouseinput.h" #include "touchmanager.h" +#include "input/inputmanager.h" + #include "debug.h" bool padClicked(false); @@ -96,6 +98,7 @@ static void moveChar(int x, int y) touchManager.setActionActive(Input::KEY_MOVE_DOWN, false); touchManager.setActionActive(Input::KEY_MOVE_UP, false); } + inputManager.updateConditionMask(); } impHandler(padClick) |