[Scummvm-git-logs] scummvm master -> 845c739801f356ce0744e0531e0e5280847da6b1

AndywinXp noreply at scummvm.org
Thu Jan 12 21:11:22 UTC 2023


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:
845c739801 SCUMM: DIMUSE: Avoid using a nullptr stream


Commit: 845c739801f356ce0744e0531e0e5280847da6b1
    https://github.com/scummvm/scummvm/commit/845c739801f356ce0744e0531e0e5280847da6b1
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-01-12T22:11:12+01:00

Commit Message:
SCUMM: DIMUSE: Avoid using a nullptr stream

Changed paths:
    engines/scumm/imuse_digi/dimuse_tracks.cpp


diff --git a/engines/scumm/imuse_digi/dimuse_tracks.cpp b/engines/scumm/imuse_digi/dimuse_tracks.cpp
index 811f08e8e32..e4a489478c4 100644
--- a/engines/scumm/imuse_digi/dimuse_tracks.cpp
+++ b/engines/scumm/imuse_digi/dimuse_tracks.cpp
@@ -261,6 +261,7 @@ void IMuseDigital::tracksLowLatencyCallback() {
 		// We use a separate queue cardinality handling, since SMUSH audio and iMUSE audio can overlap...
 		bool canQueueBufs = (int)_internalMixer->getStream(idx)->numQueuedStreams() < (_maxQueuedStreams + 1);
 		bool canQueueFtSmush = (int)_internalMixer->getStream(-1)->numQueuedStreams() < (_maxQueuedStreams + 1);
+		canQueueFtSmush &= _internalMixer->getStream(-1) != nullptr;
 
 		if (canQueueBufs) {
 			if (track)




More information about the Scummvm-git-logs mailing list