Changeset adee2d264eb04bdc0bdbf87c79903e08d589fe83

Show
Ignore:
Timestamp:
03/29/08 03:24:17 (5 months ago)
Author:
Rafaël Carré <funman@videolan.org>
git-committer:
Rafaël Carré <funman@videolan.org> 1206757457 +0100
git-parent:

[9d2636c560417a5fdfc0081983efdd996428cd9c]

git-author:
Rafaël Carré <funman@videolan.org> 1206757457 +0100
Message:

Do not crash in vout destruction when exiting

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • src/video_output/video_output.c

    r93ed4c4 radee2d2  
    509509#ifndef __APPLE__ 
    510510    vout_thread_t *p_another_vout; 
    511     playlist_t *p_playlist = pl_Yield( p_vout ); 
    512  
    513     /* This is a dirty hack for mostly Linux, where there is no way to get the GUI 
    514        back if you closed it while playing video. This is solved in Mac OS X, 
    515        where we have this novelty called menubar, that will always allow you access 
    516        to the applications main functionality. They should try that on linux sometime */ 
    517     p_another_vout = vlc_object_find( p_this->p_libvlc, 
    518                                       VLC_OBJECT_VOUT, FIND_ANYWHERE ); 
    519     if( p_another_vout == NULL ) 
    520     { 
    521         vlc_value_t val; 
    522         val.b_bool = VLC_TRUE; 
    523         var_Set( p_playlist, "intf-show", val ); 
     511 
     512    playlist_t *p_playlist = pl_Get( p_vout ); 
     513    if( p_playlist->b_die ) return; 
     514    vlc_object_yield( p_playlist ); 
     515/* This is a dirty hack for mostly Linux, where there is no way to get the GUI 
     516   back if you closed it while playing video. This is solved in Mac OS X, 
     517   where we have this novelty called menubar, that will always allow you access 
     518   to the applications main functionality. They should try that on linux sometime */ 
     519        p_another_vout = vlc_object_find( p_this->p_libvlc, 
     520                                          VLC_OBJECT_VOUT, FIND_ANYWHERE ); 
     521        if( p_another_vout == NULL ) 
     522        { 
     523            vlc_value_t val; 
     524            val.b_bool = VLC_TRUE; 
     525            var_Set( p_playlist, "intf-show", val ); 
    524526    } 
    525527    else