From 4bb1fdb40dcda49be2fdf68dd5c16db2ec05e2ff Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 30 Jan 2010 18:09:03 +0100 Subject: [PATCH] simplify code responsible for deleting songs a bit --- src/ncmpcpp.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index 35714e19..deca3a1a 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -576,9 +576,8 @@ int main(int argc, char *argv[]) } else { - Playlist::BlockNowPlayingUpdate = 1; wFooter->SetTimeout(50); - int del_counter = 0; + bool adjust_np = myPlaylist->NowPlaying > int(myPlaylist->CurrentSong()->GetPosition()); while (!myPlaylist->Items->Empty() && Keypressed(input, Key.Delete)) { size_t id = myPlaylist->Items->Choice(); @@ -586,21 +585,19 @@ int main(int argc, char *argv[]) Playlist::BlockUpdate = 1; myPlaylist->UpdateTimer(); // needed for keeping proper position of now playing song. - if (myPlaylist->NowPlaying > int(myPlaylist->CurrentSong()->GetPosition())-del_counter) + if (adjust_np) --myPlaylist->NowPlaying; 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); - Playlist::BlockNowPlayingUpdate = 0; } } else if (