Make sure we've assigned mixer->output_stream before calling MIX_CreateGroup() (thanks @AntTheAlchemist!)

slouken · slouken · commit a4b9c6376228 · 2025-09-19T07:29:21.000-07:00
diff --git a/src/SDL_mixer.c b/src/SDL_mixer.c
@@ -762,6 +762,9 @@ static MIX_Mixer *CreateMixer(SDL_AudioStream *stream)
         }
     }
 
+    mixer->gain = 1.0f;
+    mixer->output_stream = stream;
+
     mixer->track_tags = SDL_CreateProperties();
     if (!mixer->track_tags) {
         goto failed;
@@ -772,9 +775,6 @@ static MIX_Mixer *CreateMixer(SDL_AudioStream *stream)
         goto failed;
     }
 
-    mixer->gain = 1.0f;
-    mixer->output_stream = stream;
-
     SDL_SetAudioStreamGetCallback(stream, MixerCallback, mixer);
 
     MIX_VBAP2D_Init(&mixer->vbap2d, output_spec.channels);

Original file line number	Diff line number	Diff line change
`@@ -762,6 +762,9 @@ static MIX_Mixer CreateMixer(SDL_AudioStream stream)`
`762`	`762`	`}`
`763`	`763`	`}`
`764`	`764`
	`765`	`+ mixer->gain = 1.0f;`
	`766`	`+ mixer->output_stream = stream;`
	`767`	`+`
`765`	`768`	`mixer->track_tags = SDL_CreateProperties();`
`766`	`769`	`if (!mixer->track_tags) {`
`767`	`770`	`goto failed;`
`@@ -772,9 +775,6 @@ static MIX_Mixer CreateMixer(SDL_AudioStream stream)`
`772`	`775`	`goto failed;`
`773`	`776`	`}`
`774`	`777`
`775`		`- mixer->gain = 1.0f;`
`776`		`- mixer->output_stream = stream;`
`777`		`-`
`778`	`778`	`SDL_SetAudioStreamGetCallback(stream, MixerCallback, mixer);`
`779`	`779`
`780`	`780`	`MIX_VBAP2D_Init(&mixer->vbap2d, output_spec.channels);`