Commit 3ed58f7c authored by Cyril Deguet's avatar Cyril Deguet

* vlcproc.cpp: don't use a vout when it has been destroyed !

 (fixes some deadlocks/crashes when switching between layouts with
 the default skin)
parent b9619efa
...@@ -216,7 +216,7 @@ void VlcProc::dropVout() ...@@ -216,7 +216,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;
} }
} }
...@@ -610,13 +610,13 @@ void *VlcProc::getWindow( intf_thread_t *pIntf, vout_thread_t *pVout, ...@@ -610,13 +610,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