[Scummvm-git-logs] scummvm master -> ad336de7bb7fe79cf86df5d742a761943ff44300

sluicebox 22204938+sluicebox at users.noreply.github.com
Fri Feb 26 09:21:35 UTC 2021


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:
ad336de7bb SCI32: Fix kDoAudioPlay regression


Commit: ad336de7bb7fe79cf86df5d742a761943ff44300
    https://github.com/scummvm/scummvm/commit/ad336de7bb7fe79cf86df5d742a761943ff44300
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2021-02-26T01:19:57-08:00

Commit Message:
SCI32: Fix kDoAudioPlay regression

Fixes kDoSoundPlay crash when called from an SCI32 game, introduced in
364542e9e149534df54ec07a07dce0b20cae897e

Changed paths:
    engines/sci/sound/soundcmd.cpp


diff --git a/engines/sci/sound/soundcmd.cpp b/engines/sci/sound/soundcmd.cpp
index ebd61b481a..34901c3690 100644
--- a/engines/sci/sound/soundcmd.cpp
+++ b/engines/sci/sound/soundcmd.cpp
@@ -242,7 +242,7 @@ void SoundCommandParser::processPlaySound(reg_t obj, bool playBed, bool restorin
 
 	// Increment the sample play counter used by Pharkas CD.
 	// SSCI calls kDoAudio(Play) which did this. See kDoAudio(13).
-	if (musicSlot->isSample) {
+	if (_audio != nullptr && musicSlot->isSample) {
 		_audio->incrementPlayCounter();
 	}
 




More information about the Scummvm-git-logs mailing list