vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jul
6 19:17:14 2011 +0300| [c85aa861334a2693ee404301541a64d8941dd9eb] | committer:
Rémi Denis-Courmont
Qt4: accept close event on main interface (fix #4606)
If the event is ignored, the Qt4-X11 will reject the quit ICCM request.
This annoyingly caused VLC to inhibit logging out.
(cherry picked from commit 96fce709b0615071b5ddc17d8560a9c5794cc3b9)
Conflicts:
modules/gui/qt4/main_interface.cpp
> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=c85aa861334a2693ee404301541a64d8941dd9eb
---
modules/gui/qt4/main_interface.cpp | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/modules/gui/qt4/main_interface.cpp
b/modules/gui/qt4/main_interface.cpp
index 32f6c49..4a85795 100644
--- a/modules/gui/qt4/main_interface.cpp
+++ b/modules/gui/qt4/main_interface.cpp
@@ -1143,8 +1143,9 @@ void MainInterface::wheelEvent( QWheelEvent *e )
void MainInterface::closeEvent( QCloseEvent *e )
{
//hide();
- e->ignore();
emit askToQuit();
+ /* Accept session quit. Otherwise we break the desktop mamager. */
+ e->accept();
}
void MainInterface::setInterfaceFullScreen( bool fs )
_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits
