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

add some checks to prevent ncmpcpp from segfaulting with mpd from git

Browse Source
This commit is contained in:
unK
2008-10-04 23:18:50 +02:00
parent 457452036b
commit 5c7b7a04e1
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ncmpcpp.cpp
View File

@@ -447,7 +447,7 @@ int main(int argc, char *argv[])
sort(list.begin(), list.end(), CaseInsensitiveSorting()); sort(list.begin(), list.end(), CaseInsensitiveSorting());
for (TagList::const_iterator it = list.begin(); it != list.end(); it++) for (TagList::const_iterator it = list.begin(); it != list.end(); it++)
{ {
if (mLibArtists->Empty() || mLibArtists->Back() != *it) if ((mLibArtists->Empty() || mLibArtists->Back() != *it) && !it->empty())
mLibArtists->AddOption(*it); mLibArtists->AddOption(*it);
} }
mLibArtists->Window::Clear(); mLibArtists->Window::Clear();
@@ -476,7 +476,8 @@ int main(int argc, char *argv[])
Mpd->AddSearch(Config.media_lib_primary_tag, mLibArtists->GetOption()); Mpd->AddSearch(Config.media_lib_primary_tag, mLibArtists->GetOption());
Mpd->AddSearch(MPD_TAG_ITEM_ALBUM, *it); Mpd->AddSearch(MPD_TAG_ITEM_ALBUM, *it);
Mpd->CommitSearch(l); Mpd->CommitSearch(l);
maplist[DisplaySong(*l[0], &Config.media_lib_album_format)] = *it; if (!l.empty() && l[0]->GetAlbum() != UNKNOWN_ALBUM)
maplist[DisplaySong(*l[0], &Config.media_lib_album_format)] = *it;
FreeSongList(l); FreeSongList(l);
} }
for (std::map<string, string>::const_iterator it = maplist.begin(); it != maplist.end(); it++) for (std::map<string, string>::const_iterator it = maplist.begin(); it != maplist.end(); it++)
@@ -611,7 +612,8 @@ int main(int argc, char *argv[])
Mpd->StartSearch(1); Mpd->StartSearch(1);
Mpd->AddSearch(MPD_TAG_ITEM_ALBUM, *it); Mpd->AddSearch(MPD_TAG_ITEM_ALBUM, *it);
Mpd->CommitSearch(l); Mpd->CommitSearch(l);
maplist[DisplaySong(*l[0], &Config.tag_editor_album_format)] = *it; if (!l.empty())
maplist[DisplaySong(*l[0], &Config.tag_editor_album_format)] = *it;
FreeSongList(l); FreeSongList(l);
} }
for (std::map<string, string>::const_iterator it = maplist.begin(); it != maplist.end(); it++) for (std::map<string, string>::const_iterator it = maplist.begin(); it != maplist.end(); it++)