vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Jul 6 19:17:14 2011 +0300| [96fce709b0615071b5ddc17d8560a9c5794cc3b9] | 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. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=96fce709b0615071b5ddc17d8560a9c5794cc3b9 --- 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 f744dee..a45bf4d 100644 --- a/modules/gui/qt4/main_interface.cpp +++ b/modules/gui/qt4/main_interface.cpp @@ -1246,9 +1246,10 @@ void MainInterface::wheelEvent( QWheelEvent *e ) void MainInterface::closeEvent( QCloseEvent *e ) { - e->ignore(); /* Do not quit */ // hide(); emit askToQuit(); /* ask THEDP to quit, so we have a unique method */ + /* 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
