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

check whether info entity returned by mpd is NULL or not

Browse Source
This commit is contained in:
unK
2008-10-19 18:48:57 +02:00
parent ae0a665504
commit f7e56300cf
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mpdpp.cpp
View File

@@ -376,6 +376,8 @@ Song MPDConnection::GetCurrentSong() const
mpd_sendCurrentSongCommand(itsConnection); mpd_sendCurrentSongCommand(itsConnection);
mpd_InfoEntity *item = NULL; mpd_InfoEntity *item = NULL;
item = mpd_getNextInfoEntity(itsConnection); item = mpd_getNextInfoEntity(itsConnection);
if (item)
{
Song result = item->info.song; Song result = item->info.song;
item->info.song = 0; item->info.song = 0;
mpd_freeInfoEntity(item); mpd_freeInfoEntity(item);
@@ -385,6 +387,9 @@ Song MPDConnection::GetCurrentSong() const
else else
return Song(); return Song();
} }
else
return Song();
}
void MPDConnection::GetPlaylistContent(const string &path, SongList &v) const void MPDConnection::GetPlaylistContent(const string &path, SongList &v) const
{ {

1
src/ncmpcpp.cpp
View File

@@ -103,7 +103,6 @@ time_t timer;
int now_playing = -1; int now_playing = -1;
int browsed_dir_scroll_begin = 0; int browsed_dir_scroll_begin = 0;
int stats_scroll_begin = 0;
int lock_statusbar_delay = -1; int lock_statusbar_delay = -1;