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

actions: delete stored playlists: fix infinite loop after deletion of empty playlist

Browse Source
This commit is contained in:
Andrzej Rybczak
2014-10-20 19:58:55 +02:00
parent 38b2bcc690
commit 951e9f0f26
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/actions.cpp
View File

@@ -744,6 +744,10 @@ void DeleteStoredPlaylist::run()
for (auto it = list.begin(); it != list.end(); ++it) for (auto it = list.begin(); it != list.end(); ++it)
Mpd.DeletePlaylist((*it)->value()); Mpd.DeletePlaylist((*it)->value());
Statusbar::printf("%1% deleted", list.size() == 1 ? "Playlist" : "Playlists"); Statusbar::printf("%1% deleted", list.size() == 1 ? "Playlist" : "Playlists");
// force playlists update. this happens automatically, but only after call
// to Key::read, therefore when we call PlaylistEditor::Update, it won't
// yet see it, so let's point that it needs to update it.
myPlaylistEditor->requestPlaylistsUpdate();
} }
else else
Statusbar::print("Aborted"); Statusbar::print("Aborted");
@@ -1814,7 +1818,8 @@ bool ClearPlaylist::canBeRun() const
void ClearPlaylist::run() void ClearPlaylist::run()
{ {
assert(!myPlaylistEditor->Playlists.empty()); if (myPlaylistEditor->Playlists.empty())
return;
std::string playlist = myPlaylistEditor->Playlists.current().value(); std::string playlist = myPlaylistEditor->Playlists.current().value();
bool yes = true; bool yes = true;
if (Config.ask_before_clearing_playlists) if (Config.ask_before_clearing_playlists)