From 8b2b00f51c7eb836c35ef90d6e62609bc0ca8246 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Fri, 2 Jun 2006 08:49:25 +0000 Subject: [PATCH] * gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL. --- src/ChangeLog | 4 ++++ src/gtkutil.c | 14 +++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index c74958d68b9..a3c92e6f1a1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-06-02 Jan Dj,Ad(Brv + + * gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL. + 2006-06-01 Richard Stallman * window.c (Fsplit_window): Doc fix. diff --git a/src/gtkutil.c b/src/gtkutil.c index 7d9778bfd53..2a6ed9d1524 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c @@ -1981,16 +1981,20 @@ menu_nav_ended (wmenu, data) gpointer data; { FRAME_PTR f = (FRAME_PTR) data; - Display *dpy = FRAME_X_DISPLAY (f); - BLOCK_INPUT; + if (FRAME_X_OUTPUT (f)->menubar_widget) + { GtkMenuShell *w = GTK_MENU_SHELL (FRAME_X_OUTPUT (f)->menubar_widget); + Display *dpy = FRAME_X_DISPLAY (f); + + BLOCK_INPUT; gtk_menu_shell_deactivate (w); gtk_menu_shell_deselect (w); - XUngrabKeyboard (dpy, CurrentTime); - XUngrabPointer (dpy, CurrentTime); - UNBLOCK_INPUT; + XUngrabKeyboard (dpy, CurrentTime); + XUngrabPointer (dpy, CurrentTime); + UNBLOCK_INPUT; + } } -- 2.39.5