godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #70236 from quentinguidee/refactor/delete-nullptr 

AudioServer: Remove redundant nullptr check before `delete`
This commit is contained in:
Rémi Verschelde 2022-12-19 16:26:39 +01:00
parent f29f3db419 7465ca9587
commit f117487ddb
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
servers/audio_server.cpp
View File

@ -449,12 +449,8 @@ void AudioServer::_mix_step() {
case AudioStreamPlaybackListNode::AWAITING_DELETION: case AudioStreamPlaybackListNode::AWAITING_DELETION:
case AudioStreamPlaybackListNode::FADE_OUT_TO_DELETION: case AudioStreamPlaybackListNode::FADE_OUT_TO_DELETION:
playback_list.erase(playback, [](AudioStreamPlaybackListNode *p) { playback_list.erase(playback, [](AudioStreamPlaybackListNode *p) {
if (p->prev_bus_details) { delete p->prev_bus_details;
delete p->prev_bus_details; delete p->bus_details;
}
if (p->bus_details) {
delete p->bus_details;
}
p->stream_playback.unref(); p->stream_playback.unref();
delete p; delete p;
}); });