Skip to content

M
mpd
Commit efd871ad authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

player/Thread: clear pc.next_song earlier in WaitForDecoder()

parent b78896d6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 4 deletions
src/player/Thread.cxx
View file @ efd871ad
...@@ -369,6 +369,8 @@ Player::WaitForDecoder() ...@@ -369,6 +369,8 @@ Player::WaitForDecoder()
delete song; delete song;
song = pc.next_song; song = pc.next_song;
pc.next_song = nullptr;
elapsed_time = SongTime::zero(); elapsed_time = SongTime::zero();
/* set the "starting" flag, which will be cleared by /* set the "starting" flag, which will be cleared by
...@@ -376,13 +378,10 @@ Player::WaitForDecoder() ...@@ -376,13 +378,10 @@ Player::WaitForDecoder()
decoder_starting = true; decoder_starting = true;
/* update PlayerControl's song information */ /* update PlayerControl's song information */
pc.total_time = pc.next_song->GetDuration(); pc.total_time = song->GetDuration();
pc.bit_rate = 0; pc.bit_rate = 0;
pc.audio_format.Clear(); pc.audio_format.Clear();
/* clear the queued song */
pc.next_song = nullptr;
pc.Unlock(); pc.Unlock();
/* call syncPlaylistWithQueue() in the main thread */ /* call syncPlaylistWithQueue() in the main thread */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment