[Scummvm-cvs-logs] scummvm master -> adb40844d894cd69c4c89fbaddb130a70cab6816

dreammaster dreammaster at scummvm.org
Mon Jun 20 13:44:43 CEST 2011


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:
adb40844d8 TSAGE: Bugfix for crash when exiting whilst a sound is playing


Commit: adb40844d894cd69c4c89fbaddb130a70cab6816
    https://github.com/scummvm/scummvm/commit/adb40844d894cd69c4c89fbaddb130a70cab6816
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-06-20T04:42:30-07:00

Commit Message:
TSAGE: Bugfix for crash when exiting whilst a sound is playing

Changed paths:
    engines/tsage/sound.cpp



diff --git a/engines/tsage/sound.cpp b/engines/tsage/sound.cpp
index 73eaa5f..51a24a3 100644
--- a/engines/tsage/sound.cpp
+++ b/engines/tsage/sound.cpp
@@ -55,8 +55,11 @@ SoundManager::SoundManager() {
 
 SoundManager::~SoundManager() {
 	if (__sndmgrReady) {
-		for (Common::List<Sound *>::iterator i = _soundList.begin(); i != _soundList.end(); ++i)
-			(*i)->stop();
+		for (Common::List<Sound *>::iterator i = _soundList.begin(); i != _soundList.end(); ) {
+			Sound *s = *i;
+			++i;
+			s->stop();
+		}
 		for (Common::List<SoundDriver *>::iterator i = _installedDrivers.begin(); i != _installedDrivers.end(); ) {
 			SoundDriver *driver = *i;
 			++i;






More information about the Scummvm-git-logs mailing list