status: when updating playlist, deselect modified items

This commit is contained in:
Andrzej Rybczak
2015-04-18 20:27:17 +02:00
parent f21ca2b6c6
commit ccad8fcf06

View File

@@ -416,16 +416,23 @@ void Status::Changes::playlist(unsigned previous_version)
for (; s != end; ++s) for (; s != end; ++s)
{ {
size_t pos = s->getPosition(); size_t pos = s->getPosition();
myPlaylist->registerSong(*s);
if (pos < myPlaylist->main().size()) if (pos < myPlaylist->main().size())
{ {
// if song's already in playlist, replace it with a new one // if song's already in playlist, replace it with a new one
MPD::Song &old_s = myPlaylist->main()[pos].value(); MPD::Song &old_s = myPlaylist->main()[pos].value();
myPlaylist->unregisterSong(old_s); if (old_s != *s)
old_s = std::move(*s); {
myPlaylist->registerSong(*s);
myPlaylist->unregisterSong(old_s);
myPlaylist->main()[pos].setSelected(false);
old_s = std::move(*s);
}
} }
else // otherwise just add it to playlist else // otherwise just add it to playlist
{
myPlaylist->registerSong(*s);
myPlaylist->main().addItem(std::move(*s)); myPlaylist->main().addItem(std::move(*s));
}
} }
myPlaylist->reloadTotalLength(); myPlaylist->reloadTotalLength();