Commit 6f323e7a authored by Laurent Aimar's avatar Laurent Aimar

Fixed dialog provider leaks on quit.

Thanks j-b for the infos.
parent b2efd10d
...@@ -1074,9 +1074,6 @@ void MainInterface::closeEvent( QCloseEvent *e ) ...@@ -1074,9 +1074,6 @@ void MainInterface::closeEvent( QCloseEvent *e )
{ {
hide(); hide();
THEDP->quit(); THEDP->quit();
QApplication::closeAllWindows();
QApplication::quit();
} }
void MainInterface::toggleFullScreen( void ) void MainInterface::toggleFullScreen( void )
......
...@@ -301,7 +301,7 @@ static void Close( vlc_object_t *p_this ) ...@@ -301,7 +301,7 @@ static void Close( vlc_object_t *p_this )
intf_sys_t *p_sys = p_intf->p_sys; intf_sys_t *p_sys = p_intf->p_sys;
var_Destroy (p_this->p_libvlc, "qt4-iface"); var_Destroy (p_this->p_libvlc, "qt4-iface");
QApplication::postEvent (p_sys->p_mi, new QCloseEvent()); QApplication::quit();
vlc_join (p_sys->thread, NULL); vlc_join (p_sys->thread, NULL);
pl_Release (p_this); pl_Release (p_this);
...@@ -429,6 +429,8 @@ static void *Thread( void *obj ) ...@@ -429,6 +429,8 @@ static void *Thread( void *obj )
/* And quit */ /* And quit */
msg_Dbg( p_intf, "Quitting the Qt4 Interface" ); msg_Dbg( p_intf, "Quitting the Qt4 Interface" );
QApplication::closeAllWindows();
if (p_mi != NULL) if (p_mi != NULL)
{ {
QMutexLocker locker (&iface.lock); QMutexLocker locker (&iface.lock);
......
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