]> git.sesse.net Git - vlc/commitdiff
* Fix two cases where p_playlist->status.p_item was NULL (this fixes last issues...
authorDerk-Jan Hartman <hartman@videolan.org>
Tue, 12 Apr 2005 16:43:55 +0000 (16:43 +0000)
committerDerk-Jan Hartman <hartman@videolan.org>
Tue, 12 Apr 2005 16:43:55 +0000 (16:43 +0000)
modules/gui/macosx/intf.m
modules/gui/macosx/playlist.m

index b5ab6f14a676a6a90ce89756e866c8524d27b18a..b7eee97cc6f81ac8659e6241f0f6c35334eb1613 100644 (file)
@@ -904,7 +904,7 @@ static VLCMain *_o_sharedMainInstance = nil;
             playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
                                                        FIND_ANYWHERE );
 
-            if( p_playlist == NULL )
+            if( p_playlist == NULL || p_playlist->status.p_item == NULL )
             {
                 return;
             }
@@ -926,7 +926,7 @@ static VLCMain *_o_sharedMainInstance = nil;
                 {
                     if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
                     {
-                        ;[o_vout_wnd updateTitle];
+                        [o_vout_wnd updateTitle];
                     }
                 }
                 vlc_object_release( (vlc_object_t *)p_vout );
index eca4a1b1c1d4075f2fffb3caccb68794ee2d4301..8b79e77378d985dc43c3159e546862bb2696b844 100644 (file)
@@ -253,8 +253,9 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
         return;
 
     p_item = p_playlist->status.p_item;
+    if( p_item == NULL ) return;
+    
     p_temp_item = p_item;
-
     while( p_temp_item->i_parents > 0 )
     {
         [o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0];