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

clear search result after moving items in playlist/playlist editor

Browse Source 
search results are remembered as positions and may
point to wrong ones after moving items around.
This commit is contained in:
Andrzej Rybczak
2010-12-21 18:59:54 +01:00
parent aee0361f35
commit 2b645cadda
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/ncmpcpp.cpp
View File

@@ -934,6 +934,9 @@ int main(int argc, char *argv[])
else if (myScreen == myPlaylist && !myPlaylist->Items->Empty()) else if (myScreen == myPlaylist && !myPlaylist->Items->Empty())
{ {
CHECK_PLAYLIST_FOR_FILTERING; CHECK_PLAYLIST_FOR_FILTERING;
// remove search results as we may move them to different positions, but
// search rememebers positions and may point to wrong ones after that.
myPlaylist->Items->Search("");
wFooter->SetTimeout(50); wFooter->SetTimeout(50);
if (myPlaylist->Items->hasSelected()) if (myPlaylist->Items->hasSelected())
{ {
@@ -1012,6 +1015,9 @@ int main(int argc, char *argv[])
} }
else if (myScreen->ActiveWindow() == myPlaylistEditor->Content && !myPlaylistEditor->Content->Empty()) else if (myScreen->ActiveWindow() == myPlaylistEditor->Content && !myPlaylistEditor->Content->Empty())
{ {
// remove search results as we may move them to different positions, but
// search rememebers positions and may point to wrong ones after that.
myPlaylistEditor->Content->Search("");
wFooter->SetTimeout(50); wFooter->SetTimeout(50);
if (myPlaylistEditor->Content->hasSelected()) if (myPlaylistEditor->Content->hasSelected())
{ {
@@ -1066,6 +1072,9 @@ int main(int argc, char *argv[])
else if (myScreen == myPlaylist && !myPlaylist->Items->Empty()) else if (myScreen == myPlaylist && !myPlaylist->Items->Empty())
{ {
CHECK_PLAYLIST_FOR_FILTERING; CHECK_PLAYLIST_FOR_FILTERING;
// remove search results as we may move them to different positions, but
// search rememebers positions and may point to wrong ones after that.
myPlaylist->Items->Search("");
wFooter->SetTimeout(50); wFooter->SetTimeout(50);
if (myPlaylist->Items->hasSelected()) if (myPlaylist->Items->hasSelected())
{ {
@@ -1139,6 +1148,9 @@ int main(int argc, char *argv[])
} }
else if (myScreen->ActiveWindow() == myPlaylistEditor->Content && !myPlaylistEditor->Content->Empty()) else if (myScreen->ActiveWindow() == myPlaylistEditor->Content && !myPlaylistEditor->Content->Empty())
{ {
// remove search results as we may move them to different positions, but
// search rememebers positions and may point to wrong ones after that.
myPlaylistEditor->Content->Search("");
wFooter->SetTimeout(50); wFooter->SetTimeout(50);
if (myPlaylistEditor->Content->hasSelected()) if (myPlaylistEditor->Content->hasSelected())
{ {
@@ -1195,6 +1207,9 @@ int main(int argc, char *argv[])
ShowMessage("No selected items to move!"); ShowMessage("No selected items to move!");
continue; continue;
} }
// remove search results as we may move them to different positions, but
// search rememebers positions and may point to wrong ones after that.
myPlaylist->Items->Search("");
Playlist::BlockUpdate = 1; Playlist::BlockUpdate = 1;
size_t pos = myPlaylist->Items->Choice(); size_t pos = myPlaylist->Items->Choice();
std::vector<size_t> list; std::vector<size_t> list;