[Scummvm-cvs-logs] scummvm master -> 86a593af091381663520f422727b8c0b7b66b6e3

[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:
86a593af09 LAB: Simplify check order


Commit: 86a593af091381663520f422727b8c0b7b66b6e3
    https://github.com/scummvm/scummvm/commit/86a593af091381663520f422727b8c0b7b66b6e3
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-12-27T13:34:50+01:00

Commit Message:
LAB: Simplify check order

Changed paths:
    engines/lab/engine.cpp



diff --git a/engines/lab/engine.cpp b/engines/lab/engine.cpp
index 2d45ab6..95dcc71 100644
--- a/engines/lab/engine.cpp
+++ b/engines/lab/engine.cpp
@@ -553,15 +553,15 @@ bool LabEngine::processEvent(MessageClass tmpClass, uint16 code, uint16 qualifie
 	if (shouldQuit())
 		return false;
 
-	if (msgClass == kMessageRawKey && !_graphics->_longWinInFront) {
-		return processKey(curMsg, msgClass, qualifier, curPos, curInv, forceDraw, code);
-	} else if (_graphics->_longWinInFront) {
+	if (_graphics->_longWinInFront) {
 		if (msgClass == kMessageRawKey || leftButtonClick || rightButtonClick) {
 			_graphics->_longWinInFront = false;
 			_graphics->drawPanel();
 			drawRoomMessage(curInv, _closeDataPtr);
 			_graphics->screenUpdate();
 		}
+	} else if (msgClass == kMessageRawKey) {
+		return processKey(curMsg, msgClass, qualifier, curPos, curInv, forceDraw, code);
 	} else if (msgClass == kMessageButtonUp) {
 		if (!_alternate)
 			processMainButton(curInv, lastInv, oldDirection, forceDraw, buttonId, actionMode);