diff options
| author | lukaslw | 2014-06-22 19:59:00 +0200 |
|---|---|---|
| committer | lukaslw | 2014-06-22 20:00:45 +0200 |
| commit | 5a8b68676b8f6b31123e88ebdfbef1be4e57a717 (patch) | |
| tree | 02ea77ebb3e058a29e9c274fd8d5efd94bb6bab3 /common/EventMapper.cpp | |
| parent | 770a45390d4422dc9cbcb213808861297ba8e620 (diff) | |
| parent | c340570138e84277d39c64aaa7fdaf6d8be2cefb (diff) | |
| download | scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.tar.gz scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.tar.bz2 scummvm-rg350-5a8b68676b8f6b31123e88ebdfbef1be4e57a717.zip | |
Merge branch 'master' into prince-lukaslw
Diffstat (limited to 'common/EventMapper.cpp')
| -rw-r--r-- | common/EventMapper.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp index 84774742c6..30896d7514 100644 --- a/common/EventMapper.cpp +++ b/common/EventMapper.cpp @@ -37,11 +37,17 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) { #ifdef ENABLE_VKEYBD else if (ev.kbd.keycode == KEYCODE_F7 && ev.kbd.hasFlags(0)) { mappedEvent.type = EVENT_VIRTUAL_KEYBOARD; + + // Avoid blocking F7 events from engine. + addDelayedEvent(100, ev); } #endif #ifdef ENABLE_KEYMAPPER else if (ev.kbd.keycode == KEYCODE_F8 && ev.kbd.hasFlags(0)) { mappedEvent.type = EVENT_KEYMAPPER_REMAP; + + // Avoid blocking F8 events from engine. + addDelayedEvent(100, ev); } #endif } |