Commit fb450d2f authored by Max Kellermann's avatar Max Kellermann

Merge branch 'fix_cue_in_playlist' of git://github.com/maxmitti/MPD

parents 84784bad 7dea5db5
...@@ -40,6 +40,13 @@ merge_song_metadata(DetachedSong &add, const DetachedSong &base) noexcept ...@@ -40,6 +40,13 @@ merge_song_metadata(DetachedSong &add, const DetachedSong &base) noexcept
} }
add.SetLastModified(base.GetLastModified()); add.SetLastModified(base.GetLastModified());
if (add.GetStartTime().IsZero()) {
add.SetStartTime(base.GetStartTime());
}
if (add.GetEndTime().IsZero()) {
add.SetEndTime(base.GetEndTime());
}
} }
static bool static bool
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment