(x_window): Call initialize_frame_menubar

near the end, after UNBLOCK_INPUT.

diff --git a/src/xfns.c b/src/xfns.c
index a9f62fe25012539b3064cb3ecdb82b0e8eddeaa4..5b125682cc8929815dff19ff6b6e4c407ef5a743 100644 (file)
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -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");
 }