Fix wxWidgets crash

diff --git a/modules/gui/wxwindows/playlist.cpp b/modules/gui/wxwindows/playlist.cpp
index 0a5101f463d499998129281454b89326f8cb1fde..4ff523437cbb1911fdb54de78567aec0720e1c33 100644 (file)
--- a/modules/gui/wxwindows/playlist.cpp
+++ b/modules/gui/wxwindows/playlist.cpp
@@ -1183,7 +1183,8 @@ void Playlist::OnActivateItem( wxTreeEvent& event )
     else
     {
         p_node = p_wxitem->p_item;
-        if( p_wxitem->p_item->i_children > 0 )
+        if( p_wxitem->p_item->i_children > 0 &&
+            p_wxitem->p_item->pp_children[0]->i_children == -1)
         {
             p_item = p_wxitem->p_item->pp_children[0];
         }

diff --git a/src/playlist/playlist.c b/src/playlist/playlist.c
index 5bf3338508640e11a871e9f54094f40784d92178..8aa722c720aef4fc8a1e04822a8a0c017c6be6e1 100644 (file)
--- a/src/playlist/playlist.c
+++ b/src/playlist/playlist.c
@@ -37,6 +37,7 @@
 #define TITLE_ALL      N_( "All items, unsorted" )
 
 #define PLAYLIST_PROFILE 1
+#undef PLAYLIST_DEBUG
 
 /*****************************************************************************
  * Local prototypes
@@ -729,6 +730,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
         /* We are not playing from a view */
         if(  p_playlist->request.i_view == -1  )
         {
+#ifdef PLAYLIST_DEBUG
+            msg_Dbg( p_playlist, "non-view mode request");
+#endif
             /* Directly select the item, just like now */
             i_skip = p_playlist->request.i_skip;
             i_goto = p_playlist->request.i_goto;
@@ -755,6 +759,9 @@ static playlist_item_t * NextItem( playlist_t *p_playlist )
         }
         else
         {
+#ifdef PLAYLIST_DEBUG
+            msg_Dbg( p_playlist, "view mode request" );
+#endif
             p_new = p_playlist->request.p_item;
             i_skip = p_playlist->request.i_skip;