Commit 35e0d027 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* Fix two cases where p_playlist->status.p_item was NULL (this fixes last...

* Fix two cases where p_playlist->status.p_item was NULL (this fixes last issues with adding shoutcast SD to OSX playlist)
parent 715ef9ae
...@@ -904,7 +904,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -904,7 +904,7 @@ static VLCMain *_o_sharedMainInstance = nil;
playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ); FIND_ANYWHERE );
if( p_playlist == NULL ) if( p_playlist == NULL || p_playlist->status.p_item == NULL )
{ {
return; return;
} }
...@@ -926,7 +926,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -926,7 +926,7 @@ static VLCMain *_o_sharedMainInstance = nil;
{ {
if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] ) if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
{ {
;[o_vout_wnd updateTitle]; [o_vout_wnd updateTitle];
} }
} }
vlc_object_release( (vlc_object_t *)p_vout ); vlc_object_release( (vlc_object_t *)p_vout );
......
...@@ -253,8 +253,9 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/ ...@@ -253,8 +253,9 @@ belongs to an Apple hidden private API, and then can "disapear" at any time*/
return; return;
p_item = p_playlist->status.p_item; p_item = p_playlist->status.p_item;
if( p_item == NULL ) return;
p_temp_item = p_item; p_temp_item = p_item;
while( p_temp_item->i_parents > 0 ) while( p_temp_item->i_parents > 0 )
{ {
[o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0]; [o_array insertObject: [NSValue valueWithPointer: p_temp_item] atIndex: 0];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment