[Scummvm-git-logs] scummvm master -> 9407e9f46a089e73c70a4dcd79b2a61f705cda4a

Strangerke noreply at scummvm.org
Thu May 16 18:27:12 UTC 2024


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:
9407e9f46a BAGEL: Fix crash due to incorrect assert in sound code


Commit: 9407e9f46a089e73c70a4dcd79b2a61f705cda4a
    https://github.com/scummvm/scummvm/commit/9407e9f46a089e73c70a4dcd79b2a61f705cda4a
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-16T19:27:03+01:00

Commit Message:
BAGEL: Fix crash due to incorrect assert in sound code

Changed paths:
    engines/bagel/boflib/sound.cpp


diff --git a/engines/bagel/boflib/sound.cpp b/engines/bagel/boflib/sound.cpp
index a636d00eed3..0dd0be7a8c0 100644
--- a/engines/bagel/boflib/sound.cpp
+++ b/engines/bagel/boflib/sound.cpp
@@ -228,7 +228,7 @@ bool CBofSound::play(uint32 dwBeginHere, uint32 TimeFormatFlag) {
 		}
 
 		// WAVE and MIX are mutually exclusive
-		assert(!((_wFlags & SOUND_WAVE) && (_wFlags & SOUND_MIX)));
+		assert(!((_wFlags & SOUND_WAVE) && (_wFlags & SOUND_MIDI)));
 
 		if (_wFlags & SOUND_WAVE) {
 			if (_wFlags & SOUND_QUEUE)




More information about the Scummvm-git-logs mailing list