Mercurial > audlegacy
changeset 2294:05ea2b608e3d trunk
[svn] - remove the static assertion for playlistwin_list != NULL and just
cleanly return instead if that is not the case
| author | nenolod |
|---|---|
| date | Sun, 07 Jan 2007 15:14:59 -0800 |
| parents | 10e07bc9a8c9 |
| children | 1dfa77851301 |
| files | ChangeLog audacious/ui_playlist.c audacious/ui_preferences.c |
| diffstat | 3 files changed, 10 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 07 14:14:14 2007 -0800 +++ b/ChangeLog Sun Jan 07 15:14:59 2007 -0800 @@ -1,3 +1,10 @@ +2007-01-07 22:14:14 +0000 Jonathan Schleifer <js@h3c.de> + revision [3594] + WTF addr? ITYM ptr! + trunk/audacious/memorypool.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2007-01-07 08:51:04 +0000 William Pitcock <nenolod@nenolod.net> revision [3592] - log crashes in .audacious/log
--- a/audacious/ui_playlist.c Sun Jan 07 14:14:14 2007 -0800 +++ b/audacious/ui_playlist.c Sun Jan 07 15:14:59 2007 -0800 @@ -246,13 +246,14 @@ void playlistwin_update_list(Playlist *playlist) { - g_return_if_fail(playlistwin_list != NULL); + /* this can happen early on. just bail gracefully. */ + if (playlistwin_list == NULL) + return; widget_draw(WIDGET(playlistwin_list)); widget_draw(WIDGET(playlistwin_slider)); playlistwin_update_info(playlist); playlistwin_update_sinfo(playlist); - /* mainwin_update_jtf(); */ } #if 0
--- a/audacious/ui_preferences.c Sun Jan 07 14:14:14 2007 -0800 +++ b/audacious/ui_preferences.c Sun Jan 07 15:14:59 2007 -0800 @@ -1611,16 +1611,6 @@ cfg.convert_slash = gtk_toggle_button_get_active(button); } -#if 0 -static void -on_playlist_update_clicked(GtkButton * button, - gpointer data) -{ - playlistwin_update_list(); - draw_playlist_window(TRUE); -} -#endif - static void on_use_pl_metadata_realize(GtkToggleButton * button, gpointer data)