[Scummvm-cvs-logs] scummvm master -> 8706f8c28836b171886e5f0092a773863a2fedd3

[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:
8706f8c288 SHERLOCK: RT: Fix violin not playing all the way through


Commit: 8706f8c28836b171886e5f0092a773863a2fedd3
    https://github.com/scummvm/scummvm/commit/8706f8c28836b171886e5f0092a773863a2fedd3
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2016-02-19T20:07:51-05:00

Commit Message:
SHERLOCK: RT: Fix violin not playing all the way through

Changed paths:
    engines/sherlock/sound.cpp



diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 5a9f0c2..e5b1099 100644
--- a/engines/sherlock/sound.cpp
+++ b/engines/sherlock/sound.cpp
@@ -120,7 +120,9 @@ byte Sound::decodeSample(byte sample, byte &reference, int16 &scale) {
 }
 
 bool Sound::playSound(const Common::String &name, WaitType waitType, int priority, const char *libraryFilename) {
-	stopSound();
+	// Scalpel has only a single sound handle, so it must be stopped before starting a new sound
+	if (IS_SERRATED_SCALPEL)
+		stopSound();
 
 	Common::String filename = formFilename(name);