From 1fe8b6382519456ea26f1023576193c3c4e41b88 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Wed, 31 Aug 2016 19:37:51 -0400
Subject: TITANIC: Fix crash when loading second sound

---
 engines/titanic/sound/sound.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'engines/titanic/sound')

diff --git a/engines/titanic/sound/sound.cpp b/engines/titanic/sound/sound.cpp
index 7e791c2ba5..045f5aad91 100644
--- a/engines/titanic/sound/sound.cpp
+++ b/engines/titanic/sound/sound.cpp
@@ -87,13 +87,16 @@ void CSound::stopChannel(int channel) {
 }
 
 void CSound::checkSounds() {
-	for (CSoundItemList::iterator i = _sounds.begin(); i != _sounds.end(); ++i) {
+	for (CSoundItemList::iterator i = _sounds.begin(); i != _sounds.end(); ) {
 		CSoundItem *soundItem = *i;
+
 		if (soundItem->_active && soundItem->_freeFlag) {
 			if (_soundManager.isActive(soundItem->_waveFile)) {
-				_sounds.remove(soundItem);
+				i = _sounds.erase(i);
 				delete soundItem;
 			}
+		} else {
+			++i;
 		}
 	}
 }
-- 
cgit v1.2.3