diff options
| author | Cosimo Cecchi <cosimoc@gnome.org> | 2012-06-29 18:30:53 -0400 |
|---|---|---|
| committer | Cosimo Cecchi <cosimoc@gnome.org> | 2012-06-29 18:30:53 -0400 |
| commit | d22624b18e1123659dcbb6e069eab15ea3072828 (patch) | |
| tree | 1aa8a05643750c522f94b49415bfc7f927eabe0c /gtk/gtkmenubutton.c | |
| parent | 0d665fdf451882b23e8a1eb04a2d4655abfec8de (diff) | |
| download | gtk+-d22624b18e1123659dcbb6e069eab15ea3072828.tar.gz | |
menubutton: don't dereference NULL GdkEvent
Since we explictly call popup_menu with NULL when it's
keyboard-activated, we need to be careful and not access event->device
without checking for event != NULL before.
Diffstat (limited to 'gtk/gtkmenubutton.c')
| -rw-r--r-- | gtk/gtkmenubutton.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c index 4c1a2f1efb..63bea8c824 100644 --- a/gtk/gtkmenubutton.c +++ b/gtk/gtkmenubutton.c @@ -307,7 +307,9 @@ popup_menu (GtkMenuButton *menu_button, break; } - gtk_menu_popup_for_device (GTK_MENU (priv->menu), event->device, NULL, NULL, + gtk_menu_popup_for_device (GTK_MENU (priv->menu), + event ? event->device : NULL, + NULL, NULL, func, GTK_WIDGET (menu_button), NULL, |