Browse Source

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.
pull/2/head
Rémi Denis-Courmont 18 years ago
parent
commit
5253760be2
  1. 7
      modules/gui/qt4/components/interface_widgets.cpp

7
modules/gui/qt4/components/interface_widgets.cpp

@ -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 );
}
/**

Loading…
Cancel
Save