* backport of [11500] [11501] and [11502]

[vlc] / modules / gui / macosx / playlist.m

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index b3b6fccbc2f9a2ca6beb46aaeb56086bbd387fb4..40a51678615bd3f4287e9b4e2e6fa6e29ca7cec4 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -925,7 +925,14 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
         }
         if( o_result != NULL )
         {
-            for( i = 1 ; i < [o_result count] - 1 ; i++ )
+            int i_start;
+            if( [[o_result objectAtIndex: 0] pointerValue] ==
+                                                    p_playlist->p_general )
+            i_start = 1;
+            else
+            i_start = 0;
+
+            for( i = i_start ; i < [o_result count] - 1 ; i++ )
             {
                 [o_outline_view expandItem: [o_outline_dict objectForKey:
                             [NSString stringWithFormat: @"%p",