Commit 182ee591 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* backport [17405] don't bring the intf to the front when the last vout closes...

* backport [17405] don't bring the intf to the front when the last vout closes on OSX. It messes up the window focus.
parent 35e651b8
...@@ -470,9 +470,14 @@ void vout_Destroy( vout_thread_t *p_vout ) ...@@ -470,9 +470,14 @@ void vout_Destroy( vout_thread_t *p_vout )
/* Free structure */ /* Free structure */
vlc_object_destroy( p_vout ); vlc_object_destroy( p_vout );
/* This is a dirty hack for mostly Linux, where there is no way to get the GUI
back if you closed it while playing video. This is solved in Mac OS X,
where we have this novelty called menubar, that will always allow you access
to the applications main functionality. They should try that on linux sometime */
/* If it was the last vout, tell the interface to show up */ /* If it was the last vout, tell the interface to show up */
if( p_playlist != NULL ) if( p_playlist != NULL )
{ {
#ifndef __APPLE__
vout_thread_t *p_another_vout = vlc_object_find( p_playlist, vout_thread_t *p_another_vout = vlc_object_find( p_playlist,
VLC_OBJECT_VOUT, FIND_ANYWHERE ); VLC_OBJECT_VOUT, FIND_ANYWHERE );
if( p_another_vout == NULL ) if( p_another_vout == NULL )
...@@ -485,6 +490,7 @@ void vout_Destroy( vout_thread_t *p_vout ) ...@@ -485,6 +490,7 @@ void vout_Destroy( vout_thread_t *p_vout )
{ {
vlc_object_release( p_another_vout ); vlc_object_release( p_another_vout );
} }
#endif
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
} }
......
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