[vlc-commits] qt: avoid forwarding contextmenu events from videowidget to main UI

Pierre Lamot git at videolan.org
Tue Oct 31 18:18:41 CET 2017


vlc | branch: master | Pierre Lamot <pierre at videolabs.io> | Fri Oct 27 18:29:42 2017 +0200| [d2f73eb99294daa7c514aa9341a4673df43d9c98] | committer: Jean-Baptiste Kempf

qt: avoid forwarding contextmenu events from videowidget to main UI

Vout send intf-popupmenu resquest itself on right click, this was leading
  to a race condition for the menu creation.

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/gui/qt/components/interface_widgets.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index 08079ec9c4..7c34d13614 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -125,6 +125,7 @@ bool VideoWidget::request( struct vout_window_t *p_wnd )
      * in Qt4-X11 changes the WinId of the widget, so we need to create another
      * dummy widget that stays within the reparentable widget. */
     stable = new QWidget();
+    stable->setContextMenuPolicy( Qt::PreventContextMenu );
     QPalette plt = palette();
     plt.setColor( QPalette::Window, Qt::black );
     stable->setPalette( plt );



More information about the vlc-commits mailing list