[Scummvm-cvs-logs] scummvm master -> b8aaac27ba01328803e34453753bb3863e090cc3

[digitall]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
b8aaac27ba KEYMAPPER: Avoid blocking F8 events from engine when using keymapper.


Commit: b8aaac27ba01328803e34453753bb3863e090cc3
    https://github.com/scummvm/scummvm/commit/b8aaac27ba01328803e34453753bb3863e090cc3
Author: D G Turner (digitall at scummvm.org)
Date: 2014-04-16T13:17:32+01:00

Commit Message:
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.

Changed paths:
    common/EventMapper.cpp



diff --git a/common/EventMapper.cpp b/common/EventMapper.cpp
index 2f4939d..30896d7 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
 	}