summaryrefslogtreecommitdiff
path: root/modules/minimp3
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2022-06-22 23:33:51 +0200
committerGitHub <noreply@github.com>2022-06-22 23:33:51 +0200
commitd1dac8427a6a41e8fc0a76807887a57a8fe6fd10 (patch)
tree8d23b28484ab0712abeeb2e6134f4ed9ceba36cc /modules/minimp3
parente9ca15b6a6788fd739e85ba3f6ed3ee21c246257 (diff)
parentafd2bbaa5f8bda7ad1e830d75d80fbdffbbd08ec (diff)
Merge pull request #55846 from ellenhp/fix_ogg_edge_cases
Fix ogg edge cases
Diffstat (limited to 'modules/minimp3')
-rw-r--r--modules/minimp3/audio_stream_mp3.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/modules/minimp3/audio_stream_mp3.cpp b/modules/minimp3/audio_stream_mp3.cpp
index b5b51403f7..c37bea519f 100644
--- a/modules/minimp3/audio_stream_mp3.cpp
+++ b/modules/minimp3/audio_stream_mp3.cpp
@@ -38,7 +38,9 @@
#include "core/io/file_access.h"
int AudioStreamPlaybackMP3::_mix_internal(AudioFrame *p_buffer, int p_frames) {
- ERR_FAIL_COND_V(!active, 0);
+ if (!active) {
+ return 0;
+ }
int todo = p_frames;