Commit 5253760b authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove recursive/deadlocking calls in Qt4 embedded video (refs #2136).

The vout code invokes the Qt4 video widget through the Qt4 window
submodule. Hence, the video widget cannot call the vout window code.
This is where the embedded video crashes seem to come from.
Unfortunately, this commit trades the deadlock (on 1.0) or the crash
(on 0.9) for an assertion failure.
parent 69dcbfc3
......@@ -106,13 +106,10 @@ void VideoWidget::paintEvent(QPaintEvent *ev)
#endif
}
/* Kill the vout at Destruction */
VideoWidget::~VideoWidget()
{
if( !p_vout )
return;
if( vout_Control( p_vout, VOUT_CLOSE ) != VLC_SUCCESS )
vout_Control( p_vout, VOUT_REPARENT );
/* Ensure we are not leaking the video output. This would crash. */
assert( !p_vout );
}
/**
......
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