diff options
Diffstat (limited to 'src/playlist_song.c')
| -rw-r--r-- | src/playlist_song.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/playlist_song.c b/src/playlist_song.c index 88ef1059d..29efef2e3 100644 --- a/src/playlist_song.c +++ b/src/playlist_song.c @@ -69,7 +69,6 @@ apply_song_metadata(struct song *dest, const struct song *src) } else { tmp = song_file_new(dest->uri, NULL); merge_song_metadata(tmp, dest, src); - song_free(dest); } if (dest->tag != NULL && dest->tag->time > 0 && @@ -80,11 +79,14 @@ apply_song_metadata(struct song *dest, const struct song *src) (e.g. last track on a CUE file); fix it up here */ tmp->tag->time = dest->tag->time - src->start_ms / 1000; + if (!song_in_database(dest)) + song_free(dest); + return tmp; } static struct song * -playlist_check_load_song(struct song *song, const char *uri, bool secure) +playlist_check_load_song(const struct song *song, const char *uri, bool secure) { struct song *dest; |