procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't operate on menu bar of nonexistent frame

Browse source 
* src/xfns.c (Fx_hide_tip) [USE_LUCID]: Check that the current frame
is valid before redisplaying its menu. Fixes bug#22438.
This commit is contained in:
Oscar Fuentes 2016-01-23 14:11:29 +01:00
parent c32f3bc4a3
commit 76045f7d6f
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/xfns.c
View file

@ -6085,6 +6085,8 @@ Value is t if tooltip was open, nil otherwise. */)
{ {
Widget w; Widget w;
struct frame *f = SELECTED_FRAME (); struct frame *f = SELECTED_FRAME ();
if (FRAME_X_P (f) && FRAME_LIVE_P (f))
{
w = f->output_data.x->menubar_widget; w = f->output_data.x->menubar_widget;
if (!DoesSaveUnders (FRAME_DISPLAY_INFO (f)->screen) if (!DoesSaveUnders (FRAME_DISPLAY_INFO (f)->screen)
@ -6095,6 +6097,7 @@ Value is t if tooltip was open, nil otherwise. */)
unblock_input (); unblock_input ();
} }
} }
}
#endif /* USE_LUCID */ #endif /* USE_LUCID */
} }