[Scummvm-git-logs] scummvm master -> a2cc90bf9bbf42f4db953c78d02cd0f1189a3868

[bluegr]

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:
a2cc90bf9b SCI: Fix backend events treated as keyboard events


Commit: a2cc90bf9bbf42f4db953c78d02cd0f1189a3868
    https://github.com/scummvm/scummvm/commit/a2cc90bf9bbf42f4db953c78d02cd0f1189a3868
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-06-06T07:08:49+03:00

Commit Message:
SCI: Fix backend events treated as keyboard events

Prevents backend events such as EVENT_SCREEN_CHANGED
from being misinterpreted as SCI keyboard events

Changed paths:
    engines/sci/event.cpp


diff --git a/engines/sci/event.cpp b/engines/sci/event.cpp
index ab56311..7828bb5 100644
--- a/engines/sci/event.cpp
+++ b/engines/sci/event.cpp
@@ -253,6 +253,11 @@ SciEvent EventManager::getScummVMEvent() {
 		}
 	}
 
+	// Handle keyboard events for the rest of the function
+	if (ev.type != Common::EVENT_KEYDOWN && ev.type != Common::EVENT_KEYUP) {
+		return noEvent;
+	}
+
 	// Check for Control-Shift-D (debug console)
 	if (ev.type == Common::EVENT_KEYDOWN && ev.kbd.hasFlags(Common::KBD_CTRL | Common::KBD_SHIFT) && ev.kbd.keycode == Common::KEYCODE_d) {
 		// Open debug console