Skip to content

V
vlc-2-2
Commit 3ccd1495 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Fix some small potential crashes

parent 76fe19c8
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 3 deletions
modules/gui/macosx/intf.m
View file @ 3ccd1495
...@@ -797,13 +797,18 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) ...@@ -797,13 +797,18 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
if( p_intf->p_sys->b_current_title_update ) if( p_intf->p_sys->b_current_title_update )
{ {
NSString *o_temp;
vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
FIND_ANYWHERE ); FIND_ANYWHERE );
vlc_mutex_lock( &p_playlist->object_lock ); vlc_mutex_lock( &p_playlist->object_lock );
[o_scrollfield setStringValue: [NSString stringWithUTF8String: o_temp = [NSString stringWithUTF8String:
p_playlist->pp_items[p_playlist->i_index]->input.psz_name]]; p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
if( o_temp == NULL )
o_temp = [NSString stringWithCString:
p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
vlc_mutex_unlock( &p_playlist->object_lock ); vlc_mutex_unlock( &p_playlist->object_lock );
[o_scrollfield setStringValue: o_temp ];
if( p_vout != NULL ) if( p_vout != NULL )
{ {
...@@ -820,7 +825,6 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key ) ...@@ -820,7 +825,6 @@ unsigned int VLCModifiersToCocoa( unsigned int i_key )
vlc_object_release( (vlc_object_t *)p_vout ); vlc_object_release( (vlc_object_t *)p_vout );
} }
[o_playlist updateRowSelection]; [o_playlist updateRowSelection];
// [o_info updateInfo];
p_intf->p_sys->b_current_title_update = FALSE; p_intf->p_sys->b_current_title_update = FALSE;
} }
......
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