Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

do not delete items from playlist if sending command delete failed

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-11-05 22:16:54 +01:00
parent 60d932ef68
commit 5b2dbe026c
3 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/ncmpcpp.cpp
View File

@@ -586,20 +586,20 @@ int main(int argc, char *argv[])
{
if (!myPlaylist->Items->Empty() && myScreen == myPlaylist)
{
Playlist::BlockUpdate = 1;
if (myPlaylist->Items->hasSelected())
{
std::vector<size_t> list;
myPlaylist->Items->GetSelected(list);
Mpd.StartCommandsList();
for (std::vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); ++it)
{
Mpd.DeleteID((*myPlaylist->Items)[*it].GetID());
myPlaylist->Items->DeleteOption(*it);
if (Mpd.CommitCommandsList())
{
for (size_t i = 0; i < myPlaylist->Items->Size(); ++i)
myPlaylist->Items->Select(i, 0);
myPlaylist->FixPositions(list.front());
ShowMessage("Selected items deleted!");
}
Mpd.CommitCommandsList();
myPlaylist->FixPositions(list.front());
ShowMessage("Selected items deleted!");
}
else
{
@@ -615,11 +615,15 @@ int main(int argc, char *argv[])
// needed for keeping proper position of now playing song.
if (myPlaylist->NowPlaying > int(myPlaylist->CurrentSong()->GetPosition())-del_counter)
--myPlaylist->NowPlaying;
Mpd.DeleteID(myPlaylist->CurrentSong()->GetID());
myPlaylist->Items->DeleteOption(id);
myPlaylist->Items->Refresh();
wFooter->ReadKey(input);
++del_counter;
if (Mpd.DeleteID(myPlaylist->CurrentSong()->GetID()))
{
myPlaylist->Items->DeleteOption(id);
myPlaylist->Items->Refresh();
wFooter->ReadKey(input);
++del_counter;
}
else
break;
}
myPlaylist->FixPositions(myPlaylist->Items->Choice());
wFooter->SetTimeout(ncmpcpp_window_timeout);