[Scummvm-cvs-logs] scummvm master -> 79b0309fd1418d17e1f4c95b0db3d527cd528205

[wjp]

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:
79b0309fd1 SCI32: Fix dropping events in kEditText


Commit: 79b0309fd1418d17e1f4c95b0db3d527cd528205
    https://github.com/scummvm/scummvm/commit/79b0309fd1418d17e1f4c95b0db3d527cd528205
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2016-07-02T22:56:53+02:00

Commit Message:
SCI32: Fix dropping events in kEditText

Changed paths:
    engines/sci/graphics/controls32.cpp



diff --git a/engines/sci/graphics/controls32.cpp b/engines/sci/graphics/controls32.cpp
index 61dfbed..6aad636 100644
--- a/engines/sci/graphics/controls32.cpp
+++ b/engines/sci/graphics/controls32.cpp
@@ -191,7 +191,8 @@ reg_t GfxControls32::kernelEditText(const reg_t controlObject) {
 
 		// Consume the event now that we know it is not one of the
 		// defocusing events above
-		eventManager->getSciEvent(SCI_EVENT_ANY);
+		if (event.type != SCI_EVENT_NONE)
+			eventManager->getSciEvent(SCI_EVENT_ANY);
 
 		// NOTE: In the original engine, the font and bitmap were
 		// reset here on each iteration through the loop, but it