]> git.sesse.net Git - vlc/commitdiff
Fixed dialog provider leaks on quit.
authorLaurent Aimar <fenrir@videolan.org>
Mon, 5 Jan 2009 22:09:51 +0000 (23:09 +0100)
committerLaurent Aimar <fenrir@videolan.org>
Mon, 5 Jan 2009 22:12:02 +0000 (23:12 +0100)
Thanks j-b for the infos.

modules/gui/qt4/main_interface.cpp
modules/gui/qt4/qt4.cpp

index 7fcf0690c0072dc6ca0dd6730b884de7eb88b12f..dc55bc53f4cbc3cf983ab138cc8e65bd35f3a3d8 100644 (file)
@@ -1074,9 +1074,6 @@ void MainInterface::closeEvent( QCloseEvent *e )
 {
     hide();
     THEDP->quit();
-
-    QApplication::closeAllWindows();
-    QApplication::quit();
 }
 
 void MainInterface::toggleFullScreen( void )
index 44b2ed81508e2e734e86da4466c4ce40b86d8961..822e504bbfb110cabfec9d4b856b21bc70ca9063 100644 (file)
@@ -301,7 +301,7 @@ static void Close( vlc_object_t *p_this )
     intf_sys_t *p_sys = p_intf->p_sys;
 
     var_Destroy (p_this->p_libvlc, "qt4-iface");
-    QApplication::postEvent (p_sys->p_mi, new QCloseEvent());
+    QApplication::quit();
 
     vlc_join (p_sys->thread, NULL);
     pl_Release (p_this);
@@ -429,6 +429,8 @@ static void *Thread( void *obj )
     /* And quit */
     msg_Dbg( p_intf, "Quitting the Qt4 Interface" );
 
+    QApplication::closeAllWindows();
+
     if (p_mi != NULL)
     {
         QMutexLocker locker (&iface.lock);