Commit 86c04183 authored by Gerd Moellmann's avatar Gerd Moellmann
Browse files

(set_frame_menubar): Take into account that

f->menu_bar_vector can be nil, and not a vector.  From Ken Raeburn
<raeburn@gnu.org>.
parent 291e3b68
......@@ -1690,12 +1690,13 @@ set_frame_menubar (f, first_time, deep_p)
inhibit_garbage_collection ();
/* Save the frame's previous menu bar contents data. */
bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items,
previous_menu_items_used * sizeof (Lisp_Object));
if (previous_menu_items_used)
bcopy (XVECTOR (f->menu_bar_vector)->contents, previous_items,
previous_menu_items_used * sizeof (Lisp_Object));
/* Fill in the current menu bar contents. */
menu_items = f->menu_bar_vector;
menu_items_allocated = XVECTOR (menu_items)->size;
menu_items_allocated = VECTORP (menu_items) ? ASIZE (menu_items) : 0;
init_menu_items ();
for (i = 0; i < XVECTOR (items)->size; i += 4)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment