Browse Source

Merge pull request #46202 from ellenhp/fix_mix_before_start

Always call start() on audio stream before mixing
Rémi Verschelde 4 years ago
parent
commit
c8c3bcd32f
2 changed files with 2 additions and 2 deletions
  1. 1 1
      scene/audio/audio_stream_player.cpp
  2. 1 1
      scene/audio/audio_stream_player.h

+ 1 - 1
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;
 		}

+ 1 - 1
scene/audio/audio_stream_player.h

@@ -50,7 +50,7 @@ private:
 	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;