Skip to content

V
vlc
Commit 52250745 authored by Cyril Deguet's avatar Cyril Deguet
Browse files
Options

* forward port of [15504]

parent b8118762
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/gui/skins2/src/vlcproc.cpp
View file @ 52250745
...@@ -227,7 +227,7 @@ void VlcProc::dropVout() ...@@ -227,7 +227,7 @@ void VlcProc::dropVout()
{ {
if( vout_Control( m_pVout, VOUT_REPARENT ) != VLC_SUCCESS ) if( vout_Control( m_pVout, VOUT_REPARENT ) != VLC_SUCCESS )
vout_Control( m_pVout, VOUT_CLOSE ); vout_Control( m_pVout, VOUT_CLOSE );
// m_pVout = NULL; m_pVout = NULL;
} }
} }
...@@ -625,13 +625,13 @@ void *VlcProc::getWindow( intf_thread_t *pIntf, vout_thread_t *pVout, ...@@ -625,13 +625,13 @@ void *VlcProc::getWindow( intf_thread_t *pIntf, vout_thread_t *pVout,
unsigned int *pHeightHint ) unsigned int *pHeightHint )
{ {
VlcProc *pThis = pIntf->p_sys->p_vlcProc; VlcProc *pThis = pIntf->p_sys->p_vlcProc;
pThis->m_pVout = pVout;
if( pThis->m_handleSet.empty() ) if( pThis->m_handleSet.empty() )
{ {
return NULL; return NULL;
} }
else else
{ {
pThis->m_pVout = pVout;
// Get the window handle // Get the window handle
void *pWindow = *pThis->m_handleSet.begin(); void *pWindow = *pThis->m_handleSet.begin();
// Post a resize vout command // Post a resize vout command
......
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