(update_menu_bar): Call set_frame_menubar with proper buffer current.

diff --git a/src/xdisp.c b/src/xdisp.c
index 6fb7a30ed011fb010064cda8febd505405ea9a29..3bff545f9223671c592e5220458360396995c8f7 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1261,11 +1261,11 @@ update_menu_bar (f, save_match_data)
          call1 (Vrun_hooks, Qmenu_bar_update_hook);
          current_buffer = XBUFFER (w->buffer);
          FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));
-         current_buffer = prev;
 #ifdef USE_X_TOOLKIT
          set_frame_menubar (f, 0);
 #endif /* USE_X_TOOLKIT */
 
+         current_buffer = prev;
          unbind_to (count, Qnil);
        }
     }