playlist/PlaylistSong: also copy start and end time in merge_song_metadata

This is needed to correctly load playlist entries that reference a song in a cuesheet that is treated as a folder.

playlist/PlaylistSong: also copy start and end time in merge_song_metadata
7dea5db5 · Markus Mittendrein · 803a48e9 · 7dea5db5
Commit 7dea5db5 authored Jan 01, 2020 by Markus Mittendrein
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

PlaylistSong.cxx src/playlist/PlaylistSong.cxx +7 -0

No files found.
--- a/src/playlist/PlaylistSong.cxx
+++ b/src/playlist/PlaylistSong.cxx
@@ -40,6 +40,13 @@ merge_song_metadata(DetachedSong &add, const DetachedSong &base) noexcept
 	}

 	add.SetLastModified(base.GetLastModified());
+
+	if (add.GetStartTime().IsZero()) {
+		add.SetStartTime(base.GetStartTime());
+	}
+	if (add.GetEndTime().IsZero()) {
+		add.SetEndTime(base.GetEndTime());
+	}
 }

 static bool