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

[sev-]

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

Summary:
82e73c38fc LAB: Process events during ending sequence
ca630653f8 Merge pull request #690 from WinterGrascph/fix7022


Commit: 82e73c38fcbdd04b45dfe7c2bc68d1ca125fada8
    https://github.com/scummvm/scummvm/commit/82e73c38fcbdd04b45dfe7c2bc68d1ca125fada8
Author: Bendegúz (bendeguz.nagy.rf at gmail.com)
Date: 2016-03-05T15:33:34+01:00

Commit Message:
LAB: Process events during ending sequence

LAB: Fix bug #7022 - Events not processed during ending sequence

Changed paths:
    engines/lab/processroom.cpp



diff --git a/engines/lab/processroom.cpp b/engines/lab/processroom.cpp
index 44c8d65..5093e8e 100644
--- a/engines/lab/processroom.cpp
+++ b/engines/lab/processroom.cpp
@@ -238,6 +238,8 @@ void LabEngine::doActions(const ActionList &actionList) {
 	ActionList::const_iterator action;
 	for (action = actionList.begin(); action != actionList.end(); ++action) {
 		updateEvents();
+		if (_quitLab || shouldQuit())
+			return;
 
 		switch (action->_actionType) {
 		case kActionPlaySound:
@@ -381,6 +383,8 @@ void LabEngine::doActions(const ActionList &actionList) {
 
 				while (_system->getMillis() < targetMillis) {
 					updateEvents();
+					if (_quitLab || shouldQuit())
+						return;
 					_anim->diffNextFrame();
 				}
 			}
@@ -409,6 +413,8 @@ void LabEngine::doActions(const ActionList &actionList) {
 		case kActionWaitSound:	// used in scene 44 (heart of the labyrinth / ending)
 			while (_music->isSoundEffectActive()) {
 				updateEvents();
+				if (_quitLab || shouldQuit())
+					return;
 				_anim->diffNextFrame();
 				waitTOF();
 			}


Commit: ca630653f80ecd14d107a19e450898bcb2f1b937
    https://github.com/scummvm/scummvm/commit/ca630653f80ecd14d107a19e450898bcb2f1b937
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-03-06T01:36:23+01:00

Commit Message:
Merge pull request #690 from WinterGrascph/fix7022

LAB: Process events during ending sequence

Changed paths:
    engines/lab/processroom.cpp