Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #116299 from ExpiredPopsicle/fix_mic_input_crash

Browse source 
Fix `AudioStreamPlaybackMicrophone` shutdown crash
This commit is contained in:
Thaddeus Crews 2026-02-18 08:28:11 -06:00
commit 8db94f7b5e
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
servers/audio/audio_server.cpp
View file

@ -1608,6 +1608,11 @@ void AudioServer::update() {
for (CallbackItem *ci : update_callback_list) {
ci->callback(ci->userdata);
}
_cleanup_lists();
}
void AudioServer::_cleanup_lists() {
mix_callback_list.maybe_cleanup();
update_callback_list.maybe_cleanup();
listener_changed_callback_list.maybe_cleanup();
@ -2124,6 +2129,10 @@ AudioServer::AudioServer() {
}
AudioServer::~AudioServer() {
// Cleanup resources while we still have an active AudioServer singleton,
// for resources that depend on the singleton still existing.
_cleanup_lists();
singleton = nullptr;
}

2
servers/audio/audio_server.h
View file

@ -315,6 +315,8 @@ private:
void _delete_stream_playback(Ref<AudioStreamPlayback> p_playback);
void _delete_stream_playback_list_node(AudioStreamPlaybackListNode *p_node);
void _cleanup_lists();
// TODO document if this is necessary.
SafeList<AudioStreamPlaybackBusDetails *> bus_details_graveyard_frame_old;