Skip to content

V
vlc
Commit bdfa92d3 authored by Pierre d'Herbemont's avatar Pierre d'Herbemont
Browse files
Options

macosx: Make sure we don't return from manageIntf: before setting up a new timer.

parent f4bb1746
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
modules/gui/macosx/intf.m
View file @ bdfa92d3
...@@ -1306,7 +1306,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1306,7 +1306,7 @@ static VLCMain *_o_sharedMainInstance = nil;
{ {
vlc_object_release( p_input ); vlc_object_release( p_input );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
return; goto end;
} }
if( input_item_GetNowPlaying ( p_playlist->status.p_item->p_input ) ) if( input_item_GetNowPlaying ( p_playlist->status.p_item->p_input ) )
o_temp = [NSString stringWithUTF8String: o_temp = [NSString stringWithUTF8String:
...@@ -1380,6 +1380,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -1380,6 +1380,7 @@ static VLCMain *_o_sharedMainInstance = nil;
} }
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
end:
[self updateMessageArray]; [self updateMessageArray];
if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input ) if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input )
......
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