Commit 422fbe5f authored by Karl Heuer's avatar Karl Heuer
Browse files

(x_window): Call initialize_frame_menubar

near the end, after UNBLOCK_INPUT.
parent a8e96cea
......@@ -2389,9 +2389,6 @@ x_window (f, window_prompting, minibuffer_only)
f->display.x->column_widget = pane_widget;
if (!minibuffer_only && FRAME_EXTERNAL_MENU_BAR (f))
initialize_frame_menubar (f);
/* mappedWhenManaged to false tells to the paned window to not map/unmap
the emacs screen when changing menubar. This reduces flickering. */
......@@ -2523,6 +2520,9 @@ x_window (f, window_prompting, minibuffer_only)
UNBLOCK_INPUT;
if (!minibuffer_only && FRAME_EXTERNAL_MENU_BAR (f))
initialize_frame_menubar (f);
if (FRAME_X_WINDOW (f) == 0)
error ("Unable to create window");
}
......
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