mirror of
https://github.com/macvim-dev/macvim.git
synced 2026-06-11 15:37:29 +02:00
Force flush output queue before presenting any dialog
The previous commit did not ensure the output queue was flushed before "browse" dialogs were shown.
This commit is contained in:
@@ -1286,6 +1286,9 @@ gui_mch_browse(
|
||||
//NSLog(@"gui_mch_browse(saving=%d, title=%s, dflt=%s, ext=%s, initdir=%s,"
|
||||
// " filter=%s", saving, title, dflt, ext, initdir, filter);
|
||||
|
||||
// Ensure no data is on the output queue before presenting the dialog.
|
||||
gui_macvim_force_flush();
|
||||
|
||||
#ifdef FEAT_MBYTE
|
||||
title = CONVERT_TO_UTF8(title);
|
||||
initdir = CONVERT_TO_UTF8(initdir);
|
||||
@@ -1319,6 +1322,9 @@ gui_mch_dialog(
|
||||
// "dfltbutton=%d textfield=%s)", type, title, message, buttons,
|
||||
// dfltbutton, textfield);
|
||||
|
||||
// Ensure no data is on the output queue before presenting the dialog.
|
||||
gui_macvim_force_flush();
|
||||
|
||||
#ifdef FEAT_MBYTE
|
||||
title = CONVERT_TO_UTF8(title);
|
||||
message = CONVERT_TO_UTF8(message);
|
||||
|
||||
@@ -3288,11 +3288,6 @@ do_dialog(type, title, message, buttons, dfltbutton, textfield)
|
||||
/* When GUI is running and 'c' not in 'guioptions', use the GUI dialog */
|
||||
if (gui.in_use && vim_strchr(p_go, GO_CONDIALOG) == NULL)
|
||||
{
|
||||
# ifdef FEAT_GUI_MACVIM
|
||||
/* The 'swap file exists' dialog also displays text in the editor
|
||||
* window so make sure this is flushed before showing the dialog. */
|
||||
gui_macvim_force_flush();
|
||||
# endif
|
||||
c = gui_mch_dialog(type, title, message, buttons, dfltbutton,
|
||||
textfield);
|
||||
msg_end_prompt();
|
||||
|
||||
Reference in New Issue
Block a user