Skip to content

V
vlc-1.1
Commit 560016e3 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

macosx: Use playlist_CurrentInput(). 

This should fix some race condition of freed input usage.
parent d90d8b7d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
modules/gui/macosx/intf.m
View file @ 560016e3
...@@ -1155,7 +1155,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1155,7 +1155,7 @@ static VLCMain *_o_sharedMainInstance = nil;
if( p_intf->p_sys->p_input == NULL ) if( p_intf->p_sys->p_input == NULL )
{ {
p_intf->p_sys->p_input = p_playlist->p_input; p_intf->p_sys->p_input = playlist_CurrentInput( p_playlist );
/* Refresh the interface */ /* Refresh the interface */
if( p_intf->p_sys->p_input ) if( p_intf->p_sys->p_input )
...@@ -1170,6 +1170,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1170,6 +1170,7 @@ static VLCMain *_o_sharedMainInstance = nil;
p_intf->p_sys->b_intf_update = true; p_intf->p_sys->b_intf_update = true;
p_intf->p_sys->i_play_status = END_S; p_intf->p_sys->i_play_status = END_S;
msg_Dbg( p_intf, "input has stopped, refreshing interface" ); msg_Dbg( p_intf, "input has stopped, refreshing interface" );
vlc_object_release( p_intf->p_sys->p_input );
p_intf->p_sys->p_input = NULL; p_intf->p_sys->p_input = NULL;
} }
......
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