[Scummvm-cvs-logs] scummvm master -> 428f9acdcf5eda6d852c664b81905dc7e31a3a57

[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:
428f9acdcf LAB: Revert functional change of cleanup commit


Commit: 428f9acdcf5eda6d852c664b81905dc7e31a3a57
    https://github.com/scummvm/scummvm/commit/428f9acdcf5eda6d852c664b81905dc7e31a3a57
Author: Willem Jan Palenstijn (wjp at usecode.org)
Date: 2015-12-27T00:29:05+01:00

Commit Message:
LAB: Revert functional change of cleanup commit

(7f2b69b75c8e352ea06c9571992a00d5ffe7308f)

Changed paths:
    engines/lab/engine.cpp



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