* modules/wxwindows/wxwindows.cpp, modules/skins2/src/skin_main.cpp: don't...

* modules/wxwindows/wxwindows.cpp, modules/skins2/src/skin_main.cpp: don't start the playlist if it is empty.

modules/gui/skins2/src/skin_main.cpp

@@ -219,7 +219,16 @@ static void Run( intf_thread_t *p_intf )
                                            FIND_ANYWHERE );
         if( p_playlist )
         {
-            playlist_Play( p_playlist );
+            vlc_mutex_lock( &p_playlist->object_lock );
+            if( p_playlist->i_size )
+            {
+                vlc_mutex_unlock( &p_playlist->object_lock );
+                playlist_Play( p_playlist );
+            }
+            else
+            {
+                vlc_mutex_unlock( &p_playlist->object_lock );
+            }
             vlc_object_release( p_playlist );
         }
     }

modules/gui/wxwindows/wxwindows.cpp

@@ -317,7 +317,16 @@ bool Instance::OnInit()
                                            FIND_ANYWHERE );
         if( p_playlist )
         {
-            playlist_Play( p_playlist );
+            vlc_mutex_lock( &p_playlist->object_lock );
+            if( p_playlist->i_size )
+            {
+                vlc_mutex_unlock( &p_playlist->object_lock );
+                playlist_Play( p_playlist );
+            }
+            else
+            {
+                vlc_mutex_unlock( &p_playlist->object_lock );
+            }
             vlc_object_release( p_playlist );
         }
     }