[vlc-devel] commit: ncurses: check playlist_CurrentPlayingItem() return value ( Rafaël Carré )

git version control git at videolan.org
Fri Jul 31 12:01:50 CEST 2009


vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Fri Jul 31 11:57:27 2009 +0200| [06b74990aa1ee9c14d2798ad5c69df3a3f6fefce] | committer: Rafaël Carré 

ncurses: check playlist_CurrentPlayingItem() return value

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=06b74990aa1ee9c14d2798ad5c69df3a3f6fefce
---

 modules/gui/ncurses.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index ace16b6..0421a5c 100644
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -2137,9 +2137,11 @@ static void Redraw( intf_thread_t *p_intf, time_t *t_last_refresh )
             input_thread_t *p_input2 = playlist_CurrentInput( p_playlist );
 
             PL_LOCK;
+            assert( p_item );
+            playlist_item_t *p_current_playing_item = playlist_CurrentPlayingItem(p_playlist);
             if( ( p_node && p_item->p_input == p_node->p_input ) ||
-                        ( !p_node && p_input2 &&
-                          p_item->p_input == playlist_CurrentPlayingItem(p_playlist)->p_input ) )
+                        ( !p_node && p_input2 && p_current_playing_item &&
+                          p_item->p_input == p_current_playing_item->p_input ) )
                 c = '*';
             else if( p_item == p_node || ( p_item != p_node &&
                         PlaylistIsPlaying( p_playlist, p_item ) ) )




More information about the vlc-devel mailing list