[Scummvm-cvs-logs] scummvm master -> 22bb8e2f57138a7acfde61fc3cd806bafd10222b

[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:
22bb8e2f57 SHERLOCK: RT: Fix crash in intro sequence


Commit: 22bb8e2f57138a7acfde61fc3cd806bafd10222b
    https://github.com/scummvm/scummvm/commit/22bb8e2f57138a7acfde61fc3cd806bafd10222b
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2015-08-20T07:39:10-04:00

Commit Message:
SHERLOCK: RT: Fix crash in intro sequence

Changed paths:
    engines/sherlock/talk.cpp



diff --git a/engines/sherlock/talk.cpp b/engines/sherlock/talk.cpp
index b5f0249..fffb830 100644
--- a/engines/sherlock/talk.cpp
+++ b/engines/sherlock/talk.cpp
@@ -687,7 +687,8 @@ void Talk::doScript(const Common::String &script) {
 		_talkStealth = 2;
 		_speaker |= SPEAKER_REMOVE;
 	} else {
-		pushSequence(_speaker);
+		if (IS_SERRATED_SCALPEL)
+			pushSequence(_speaker);
 		if (IS_SERRATED_SCALPEL || ui._windowOpen)
 			ui.clearWindow();