From 0f30ba2f10df20cbe57f67fcf98b3125c1c57e5f Mon Sep 17 00:00:00 2001
From: Filippos Karapetis
Date: Sun, 7 Jul 2013 19:41:42 +0300
Subject: SCI: Fix bug #3614566 - "LSL6: ScummVM locks up at Electro-Shock
 room"

We now do the jumpToTick() for hold events after waiting for the delta
of the current event, like we do for the signal set events. This keeps
the fixes for the hold timings in QFG3, while not breaking LSL6.

Many thanks to wjp for pinpointing the actual cause of the issue.
---
 engines/sci/sound/midiparser_sci.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines/sci/sound/midiparser_sci.h')

diff --git a/engines/sci/sound/midiparser_sci.h b/engines/sci/sound/midiparser_sci.h
index d3fd337644..7bd68994c8 100644
--- a/engines/sci/sound/midiparser_sci.h
+++ b/engines/sci/sound/midiparser_sci.h
@@ -110,6 +110,7 @@ protected:
 	int16 _signalToSet;
 	bool _dataincAdd;
 	int16 _dataincToAdd;
+	bool _jumpToHoldTick;
 	bool _resetOnPause;
 
 	bool _channelUsed[16];
-- 
cgit v1.2.3