From 8706f8c28836b171886e5f0092a773863a2fedd3 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Fri, 19 Feb 2016 20:07:51 -0500
Subject: SHERLOCK: RT: Fix violin not playing all the way through

---
 engines/sherlock/sound.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/engines/sherlock/sound.cpp b/engines/sherlock/sound.cpp
index 5a9f0c2ec6..e5b1099123 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);
 
-- 
cgit v1.2.3