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

[dreammaster]

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:
b4651801dd SHERLOCK: RT: Fix aborting scripts prematurely after pausing


Commit: b4651801dd9fb4192863c283faa8955fc69ea7b0
    https://github.com/scummvm/scummvm/commit/b4651801dd9fb4192863c283faa8955fc69ea7b0
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-24T19:44:25-04:00

Commit Message:
SHERLOCK: RT: Fix aborting scripts prematurely after pausing

If a script was paused via a call to cmdPauseWithoutControl, and during
this a second script is called and finishes, the first script was
also being terminated prematurely

Changed paths:
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index dad6b41..010bb3d 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -1064,6 +1064,7 @@ OpcodeReturn Talk::cmdPauseWithoutControl(const byte *&str) {
 		events.setButtonState();
 	}
 
+	_endStr = false;
 	return RET_SUCCESS;
 }