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

search engine: fix assertion failure

Browse Source
This commit is contained in:
Andrzej Rybczak
2016-01-15 15:27:50 +01:00
parent 133a794cb1
commit f482e97962
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@@ -1,4 +1,5 @@
ncmpcpp-0.7.2 (????-??-??)
* Attempt to add non-song item to playlist from search engine doesn't trigger assertion failure anymore.
ncmpcpp-0.7.1 (2016-01-01)
* Selected songs in media library can now be added to playlists.

31
src/search_engine.cpp
View File

@@ -127,7 +127,19 @@ ConstSongIterator SearchEngineWindow::endS() const
std::vector<MPD::Song> SearchEngineWindow::getSelectedSongs()
{
return {}; // TODO
std::vector<MPD::Song> result;
for (auto &item : *this)
{
if (item.isSelected())
{
assert(item.value().isSong());
result.push_back(item.value().song());
}
}
// If no item is selected, add the current one if it's a song.
if (result.empty() && !empty() && current()->value().isSong())
result.push_back(current()->value().song());
return result;
}
/**********************************************************************/
@@ -336,22 +348,7 @@ bool SearchEngine::addItemToPlaylist(bool play)
std::vector<MPD::Song> SearchEngine::getSelectedSongs()
{
std::vector<MPD::Song> result;
for (auto it = w.begin(); it != w.end(); ++it)
{
if (it->isSelected())
{
assert(it->value().isSong());
result.push_back(it->value().song());
}
}
// if no item is selected, add current one
if (result.empty() && !w.empty())
{
assert(w.current()->value().isSong());
result.push_back(w.current()->value().song());
}
return result;
return w.getSelectedSongs();
}
/***********************************************************************/