aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorD G Turner2014-04-16 13:17:32 +0100
committerD G Turner2014-04-16 13:17:32 +0100
commitb8aaac27ba01328803e34453753bb3863e090cc3 (patch)
treebef347ff9b4bd005d9b3e9cd97c9fe64633b95c4
parent8282298556bc9e5133996b90090ca41524ee86cf (diff)
downloadscummvm-rg350-b8aaac27ba01328803e34453753bb3863e090cc3.tar.gz
scummvm-rg350-b8aaac27ba01328803e34453753bb3863e090cc3.tar.bz2
scummvm-rg350-b8aaac27ba01328803e34453753bb3863e090cc3.zip
KEYMAPPER: Avoid blocking F8 events from engine when using keymapper.
This allows the keyboard mapper to be enabled without causing breakage to engines which use F8.
-rw-r--r--common/EventMapper.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp
index 2f4939dc69..30896d7514 100644
--- a/common/EventMapper.cpp
+++ b/common/EventMapper.cpp
@@ -45,6 +45,9 @@ List<Event> DefaultEventMapper::mapEvent(const Event &ev, EventSource *source) {
#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
}