From 74e95e88d8507b3e133a634abc12b5efeceba866 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 12 Jul 2014 19:41:04 +0200
Subject: [PATCH] PlaylistSong: always merge tags and LastModified

---
 src/playlist/PlaylistSong.cxx | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/playlist/PlaylistSong.cxx b/src/playlist/PlaylistSong.cxx
index d5adbdc14..3603c1add 100644
--- a/src/playlist/PlaylistSong.cxx
+++ b/src/playlist/PlaylistSong.cxx
@@ -33,7 +33,7 @@
 static void
 merge_song_metadata(DetachedSong &add, const DetachedSong &base)
 {
-	{
+	if (base.GetTag().IsDefined()) {
 		TagBuilder builder(add.GetTag());
 		builder.Complement(base.GetTag());
 		add.SetTag(builder.Commit());
@@ -42,16 +42,6 @@ merge_song_metadata(DetachedSong &add, const DetachedSong &base)
 	add.SetLastModified(base.GetLastModified());
 }
 
-static void
-apply_song_metadata(DetachedSong &dest, const DetachedSong &src)
-{
-	if (!src.GetTag().IsDefined() &&
-	    src.GetStartMS() == 0 && src.GetEndMS() == 0)
-		return;
-
-	merge_song_metadata(dest, src);
-}
-
 static bool
 playlist_check_load_song(DetachedSong &song, const SongLoader &loader)
 {
@@ -63,7 +53,7 @@ playlist_check_load_song(DetachedSong &song, const SongLoader &loader)
 	if (!song.HasRealURI() && tmp->HasRealURI())
 		song.SetRealURI(tmp->GetRealURI());
 
-	apply_song_metadata(song, *tmp);
+	merge_song_metadata(song, *tmp);
 	delete tmp;
 	return true;
 }