[vlc-commits] Qt: do not quit, let the core do it
Jean-Baptiste Kempf
git at videolan.org
Thu Dec 15 23:57:22 CET 2011
vlc/vlc-1.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Dec 15 01:19:00 2011 +0100| [2ef4244dd30648303f0d5cf064b184b85f940341] | 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.
(cherry picked from commit 5bf6f7c0728ef9df408a2fc25a61faaa90705486)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=2ef4244dd30648303f0d5cf064b184b85f940341
---
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