playlist.m: Fix the so problematic 21193.

[vlc] / modules / gui / ncurses.c

diff --git a/modules/gui/ncurses.c b/modules/gui/ncurses.c
index 857db4fb6e082454bb273ec40e09d6a56d18d6b5..64ba96bf17d89e8d2e80226477acb08b61ee8a95 100644 (file)
--- a/modules/gui/ncurses.c
+++ b/modules/gui/ncurses.c
@@ -82,7 +82,7 @@ static void Redraw         ( intf_thread_t *, time_t * );
 
 static playlist_item_t *PlaylistGetRoot( intf_thread_t * );
 static void PlaylistRebuild( intf_thread_t * );
-static void PlaylistAddNode( intf_thread_t *, playlist_item_t *, int, char *);
+static void PlaylistAddNode( intf_thread_t *, playlist_item_t *, int, const char *);
 static void PlaylistDestroy( intf_thread_t * );
 static int  PlaylistChanged( vlc_object_t *, const char *, vlc_value_t,
                              vlc_value_t, void * );
@@ -839,7 +839,7 @@ static int HandleKey( intf_thread_t *p_intf, int i_key )
         case 'q':
         case 'Q':
         case 0x1b:  /* Esc */
-            p_intf->p_libvlc->b_die = VLC_TRUE;
+            vlc_object_kill( p_intf->p_libvlc );
             return 0;
 
         /* Box switching */
@@ -1666,7 +1666,7 @@ static void PlaylistRebuild( intf_thread_t *p_intf )
 }
 
 static void PlaylistAddNode( intf_thread_t *p_intf, playlist_item_t *p_node,
-                             int i, char *c )
+                             int i, const char *c )
 {
     intf_sys_t *p_sys = p_intf->p_sys;
     playlist_item_t *p_child;
@@ -1903,7 +1903,7 @@ static void ReadDir( intf_thread_t *p_intf )
 
     if( p_sys->psz_current_dir && *p_sys->psz_current_dir )
     {
-        const char *psz_entry;
+        char *psz_entry;
 
         /* Open the dir */
         p_current_dir = utf8_opendir( p_sys->psz_current_dir );