diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2006-06-02 08:49:25 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2006-06-02 08:49:25 +0000 |
| commit | 885c1dd64ac8e08d62d56623a8b2cbca79f39122 (patch) | |
| tree | e1e9cbf3526173dac6431de619098f76e11a06ce /src/gtkutil.c | |
| parent | ec6ebf73dbd00abedbc7bb4e2fab75ed386a193a (diff) | |
| download | emacs-885c1dd64ac8e08d62d56623a8b2cbca79f39122.tar.gz | |
* gtkutil.c (menu_nav_ended): Check that menubar_widget is not NULL.
Diffstat (limited to 'src/gtkutil.c')
| -rw-r--r-- | src/gtkutil.c | 14 |
1 files changed, 9 insertions, 5 deletions
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; + } } |