Merge tag 'v0.19.10'

This commit is contained in:
Max Kellermann
2015-06-21 16:01:44 +02:00
11 changed files with 108 additions and 16 deletions

View File

@@ -378,7 +378,11 @@ decoder_run_song(DecoderControl &dc,
const DetachedSong &song, const char *uri, Path path_fs)
{
Decoder decoder(dc, dc.start_time.IsPositive(),
new Tag(song.GetTag()));
/* pass the song tag only if it's
authoritative, i.e. if it's a local file -
tags on "stream" songs are just remembered
from the last time we played it*/
song.IsFile() ? new Tag(song.GetTag()) : nullptr);
dc.state = DecoderState::START;