Skip to content

V
vlc-2-2
Commit 1d524052 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

* forward-port [17568]

parent fa22abdc
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 5 deletions
modules/gui/macosx/playlist.m
View file @ 1d524052
......@@ -256,11 +256,15 @@ NSLog( @"expandable" );
if( [[o_tc identifier] isEqualToString:@"1"] )
{
o_value = [NSString stringWithUTF8String:
p_item->p_input->psz_name];
if( o_value == NULL )
o_value = [NSString stringWithCString:
p_item->p_input->psz_name];
/* sanity check to prevent the NSString class from crashing */
if( p_item->input.psz_name != NULL )
{
o_value = [NSString stringWithUTF8String:
p_item->input.psz_name];
if( o_value == NULL )
o_value = [NSString stringWithCString:
p_item->input.psz_name];
}
}
else if( [[o_tc identifier] isEqualToString:@"2"] && p_item->p_input->p_meta &&
p_item->p_input->p_meta->psz_artist && *p_item->p_input->p_meta->psz_artist )
......
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