summaryrefslogtreecommitdiff
path: root/gtk/gtkmenubutton.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2015-06-15 19:46:33 -0400
committerMatthias Clasen <mclasen@redhat.com>2015-06-15 19:50:02 -0400
commite367c4baa0395c9cc7e7fafc70459c9e63b66322 (patch)
treebafe39c75116287689bd4cda50d00abe696a56aa /gtk/gtkmenubutton.c
parent002699402dd045e71bd108463a3f8cc7442ec538 (diff)
downloadgtk+-e367c4baa0395c9cc7e7fafc70459c9e63b66322.tar.gz
Deal with events from wrong display
GtkInspector is opening a separate display connection, which makes it more likely that gtk_get_current_event() returns an event from the "wrong" display.
Diffstat (limited to 'gtk/gtkmenubutton.c')
-rw-r--r--gtk/gtkmenubutton.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
index 17c822b384..2126087dd4 100644
--- a/gtk/gtkmenubutton.c
+++ b/gtk/gtkmenubutton.c
@@ -398,7 +398,8 @@ popup_menu (GtkMenuButton *menu_button,
break;
}
- if (event)
+ if (event != NULL &&
+ gdk_event_get_screen (event) == gtk_widget_get_screen (GTK_WIDGET (menu_button)))
{
device = gdk_event_get_device (event);
gdk_event_get_button (event, &button);