Merge pull request #46202 from ellenhp/fix_mix_before_start

Always call start() on audio stream before mixing
godotengine · Feb 19, 2021 · c8c3bcd · c8c3bcd
2 parents aeea428 + eb5566f
commit c8c3bcd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/scene/audio/audio_stream_player.cpp b/scene/audio/audio_stream_player.cpp
@@ -105,7 +105,7 @@ void AudioStreamPlayer::_mix_audio() {
 	}
 
 	if (stream_paused) {
-		if (stream_paused_fade) {
+		if (stream_paused_fade && stream_playback->is_playing()) {
 			_mix_internal(true);
 			stream_paused_fade = false;
 		}

diff --git a/scene/audio/audio_stream_player.h b/scene/audio/audio_stream_player.h
@@ -50,7 +50,7 @@ class AudioStreamPlayer : public Node {
 	Ref<AudioStream> stream;
 	Vector<AudioFrame> mix_buffer;
 	Vector<AudioFrame> fadeout_buffer;
-	bool use_fadeout;
+	bool use_fadeout = false;
 
 	SafeNumeric<float> setseek{ -1.0 };
 	SafeFlag active;