[vlc-commits] Qt: do not quit, let the core do it

Jean-Baptiste Kempf git at videolan.org
Thu Dec 15 01:20:05 CET 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Dec 15 01:19:00 2011 +0100| [5bf6f7c0728ef9df408a2fc25a61faaa90705486] | committer: Jean-Baptiste Kempf

Qt: do not quit, let the core do it

Should fix crash on quit wrt to Vout
Tested on XP, 7 and Linux.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5bf6f7c0728ef9df408a2fc25a61faaa90705486
---

 modules/gui/qt4/qt4.cpp |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/modules/gui/qt4/qt4.cpp b/modules/gui/qt4/qt4.cpp
index 8596935..025086f 100644
--- a/modules/gui/qt4/qt4.cpp
+++ b/modules/gui/qt4/qt4.cpp
@@ -514,10 +514,7 @@ static void *Thread( void *obj )
 #endif
 
     /* Last settings */
-    if( p_intf->p_sys->b_isDialogProvider )
-        app.setQuitOnLastWindowClosed( false );
-    else
-        app.setQuitOnLastWindowClosed( true );
+    app.setQuitOnLastWindowClosed( false );
 
     /* Retrieve last known path used in file browsing */
     p_intf->p_sys->filepath =



More information about the vlc-commits mailing list