Changeset a88c1a091cb383c3dbf0b7d51f1f3bba36ff5e97

Show
Ignore:
Timestamp:
05/06/04 20:04:06 (5 years ago)
Author:
Gildas Bazin <gbazin@videolan.org>
git-committer:
Gildas Bazin <gbazin@videolan.org> 1086458646 +0000
git-parent:

[788a3c84dc231bc4b5467fe4f49d0d1932010d52]

git-author:
Gildas Bazin <gbazin@videolan.org> 1086458646 +0000
Message:

* src/interface/interface.c, modules/gui/wxwindows/video.cpp: couple of fixes.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/wxwindows/video.cpp

    r788a3c8 ra88c1a0  
    129129    { 
    130130        if( !p_intf->psz_switch_intf ) 
     131        { 
    131132            if( vout_Control( p_vout, VOUT_CLOSE ) != VLC_SUCCESS ) 
    132133                vout_Control( p_vout, VOUT_REPARENT ); 
     134        } 
    133135        else 
     136        { 
    134137            if( vout_Control( p_vout, VOUT_REPARENT ) != VLC_SUCCESS ) 
    135138                vout_Control( p_vout, VOUT_CLOSE ); 
     139        } 
    136140    } 
    137141 

  • src/interface/interface.c

    r75df75b ra88c1a0  
    317317        } 
    318318 
     319        /* Make sure the old interface is completely uninitialized */ 
     320        module_Unneed( p_intf, p_intf->p_module ); 
     321 
    319322        /* Provide ability to switch the main interface on the fly */ 
    320323        psz_intf = p_intf->psz_switch_intf; 
    321324        p_intf->psz_switch_intf = NULL; 
    322  
    323         /* Make sure the old interface is completely uninitialized */ 
    324         module_Unneed( p_intf, p_intf->p_module ); 
    325325 
    326326        vlc_mutex_lock( &p_intf->object_lock );