Commit ba6f3859 authored by Jason Rumney's avatar Jason Rumney

(Fx_file_dialog): Unblock input before falling back to minibuffer.

parent 4b53b8d7
......@@ -4375,14 +4375,15 @@ If ONLY-DIR-P is non-nil, the user can only select directories. */)
break;
}
NavDialogDispose(dialogRef);
UNBLOCK_INPUT;
}
else {
UNBLOCK_INPUT;
/* Fall back on minibuffer if there was a problem */
file = Fcompleting_read (prompt, intern ("read-file-name-internal"),
dir, mustmatch, dir, Qfile_name_history,
default_filename, Qnil);
}
UNBLOCK_INPUT;
}
UNGCPRO;
......
......@@ -7808,6 +7808,7 @@ If ONLY-DIR-P is non-nil, the user can only select directories. */)
{
OPENFILENAME file_details;
BOOL file_opened = FALSE;
/* Prevent redisplay. */
specbind (Qinhibit_redisplay, Qt);
......@@ -7836,7 +7837,11 @@ If ONLY-DIR-P is non-nil, the user can only select directories. */)
file_details.lpfnHook = (LPOFNHOOKPROC) file_dialog_callback;
if (GetOpenFileName (&file_details))
file_opened = GetOpenFileName (&file_details);
UNBLOCK_INPUT;
if (file_opened)
{
dostounix_filename (filename);
if (file_details.nFilterIndex == 2)
......@@ -7857,7 +7862,6 @@ If ONLY-DIR-P is non-nil, the user can only select directories. */)
dir, mustmatch, dir, Qfile_name_history,
default_filename, Qnil);
UNBLOCK_INPUT;
file = unbind_to (count, file);
}
......
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