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

fix segfault that occured if mpd was stopped and window had to be resized

Browse Source 
we all love null pointer dereferences, don't we?
some methods from Song class need assertion guards to deal with that.
This commit is contained in:
Andrzej Rybczak
2009-10-11 01:55:36 +02:00
parent 3551057dbb
commit aebc5db0e1
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/status.cpp
View File

@@ -347,11 +347,9 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
{ {
if (myPlaylist->isPlaying()) if (myPlaylist->isPlaying())
{ {
np = Mpd.GetCurrentSong();
if (!Config.execute_on_song_change.empty()) if (!Config.execute_on_song_change.empty())
system(Config.execute_on_song_change.c_str()); system(Config.execute_on_song_change.c_str());
if (Mpd.isPlaying()) if (Mpd.isPlaying() && !(np = Mpd.GetCurrentSong()).Empty())
WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format))); WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format)));
if (Config.autocenter_mode && !myPlaylist->Items->isFiltered()) if (Config.autocenter_mode && !myPlaylist->Items->isFiltered())
myPlaylist->Items->Highlight(myPlaylist->NowPlaying); myPlaylist->Items->Highlight(myPlaylist->NowPlaying);
@@ -373,11 +371,8 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
if (((now > past || changed.SongID) && Mpd.isPlaying()) || RedrawStatusbar) if (((now > past || changed.SongID) && Mpd.isPlaying()) || RedrawStatusbar)
{ {
time(&past); time(&past);
if (np.Empty()) if (np.Empty() && !(np = Mpd.GetCurrentSong()).Empty())
{
np = Mpd.GetCurrentSong();
WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format))); WindowTitle(utf_to_locale_cpy(np.toString(Config.song_window_title_format)));
}
if (!np.Empty() && Mpd.isPlaying()) if (!np.Empty() && Mpd.isPlaying())
{ {
changed.ElapsedTime = 1; changed.ElapsedTime = 1;