[Scummvm-cvs-logs] SF.net SVN: scummvm:[34049] scummvm/branches/branch-0-12-0/engines
eriktorbjorn at users.sourceforge.net
eriktorbjorn at users.sourceforge.net
Wed Aug 20 11:13:41 CEST 2008
Revision: 34049
http://scummvm.svn.sourceforge.net/scummvm/?rev=34049&view=rev
Author: eriktorbjorn
Date: 2008-08-20 09:13:40 +0000 (Wed, 20 Aug 2008)
Log Message:
-----------
Backported the "lock mutex in setVolume()" changes, in an attempt to fix the
mysterious (but rare) IHNM crashes on loading savegames and quitting.
Modified Paths:
--------------
scummvm/branches/branch-0-12-0/engines/made/music.cpp
scummvm/branches/branch-0-12-0/engines/saga/music.cpp
Modified: scummvm/branches/branch-0-12-0/engines/made/music.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/made/music.cpp 2008-08-20 09:12:11 UTC (rev 34048)
+++ scummvm/branches/branch-0-12-0/engines/made/music.cpp 2008-08-20 09:13:40 UTC (rev 34049)
@@ -63,6 +63,8 @@
_masterVolume = volume;
+ Common::StackLock lock(_mutex);
+
for (int i = 0; i < 16; ++i) {
if (_channel[i]) {
_channel[i]->volume(_channelVolume[i] * _masterVolume / 255);
Modified: scummvm/branches/branch-0-12-0/engines/saga/music.cpp
===================================================================
--- scummvm/branches/branch-0-12-0/engines/saga/music.cpp 2008-08-20 09:12:11 UTC (rev 34048)
+++ scummvm/branches/branch-0-12-0/engines/saga/music.cpp 2008-08-20 09:13:40 UTC (rev 34049)
@@ -249,6 +249,8 @@
_masterVolume = volume;
+ Common::StackLock lock(_mutex);
+
for (int i = 0; i < 16; ++i) {
if (_channel[i]) {
_channel[i]->volume(_channelVolume[i] * _masterVolume / 255);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list