diff options
| author | Max Kellermann <max@duempel.org> | 2015-06-21 16:01:44 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2015-06-21 16:06:02 +0200 |
| commit | 90e7ace980fcfe4f894cd8e882fbfd2efba0b57d (patch) | |
| tree | b4810dd7c6fb09329e0e2c986aa2e0c6cae579fd /src/decoder/DecoderAPI.cxx | |
| parent | 2b0a127fa565c3e78d3a1e11f0fc68547dc5a161 (diff) | |
| parent | b0ff3bc7a30674fe44e946e228e8c2facd8e8377 (diff) | |
| download | mpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.tar.gz mpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.tar.xz mpd-90e7ace980fcfe4f894cd8e882fbfd2efba0b57d.zip | |
Merge tag 'v0.19.10'
Diffstat (limited to 'src/decoder/DecoderAPI.cxx')
| -rw-r--r-- | src/decoder/DecoderAPI.cxx | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/decoder/DecoderAPI.cxx b/src/decoder/DecoderAPI.cxx index eb6bb1109..cc08596a2 100644 --- a/src/decoder/DecoderAPI.cxx +++ b/src/decoder/DecoderAPI.cxx @@ -433,8 +433,11 @@ update_stream_tag(Decoder &decoder, InputStream *is) /* no stream tag present - submit the song tag instead */ - decoder.song_tag = nullptr; - } + } else + /* discard the song tag; we don't need it */ + delete decoder.song_tag; + + decoder.song_tag = nullptr; delete decoder.stream_tag; decoder.stream_tag = tag; @@ -566,7 +569,7 @@ decoder_tag(Decoder &decoder, InputStream *is, /* save the tag */ delete decoder.decoder_tag; - decoder.decoder_tag = new Tag(tag); + decoder.decoder_tag = new Tag(std::move(tag)); /* check for a new stream tag */ |