Fix race conditions with async input in some Haiku dialogs

* src/haikufns.c (Fhaiku_save_session_reply):
* src/haikufont.c (Fx_select_font): Block sigio around system
calls.

diff --git a/src/haikufns.c b/src/haikufns.c
index f7c17567b184cbbb50b6eb800fe67ad7e1890803..04c58c55a76af36973f5d8f40203fdf201af1b00 100644 (file)
--- a/src/haikufns.c
+++ b/src/haikufns.c
@@ -2672,8 +2672,10 @@ call this function yourself.  */)
   reply.quit_reply = !NILP (quit_reply);
 
   block_input ();
+  unrequest_sigio ();
   write_port (port_emacs_to_session_manager, 0, &reply,
              sizeof reply);
+  request_sigio ();
   unblock_input ();
 
   return Qnil;

diff --git a/src/haikufont.c b/src/haikufont.c
index eb00c8ff3819b122318238245cf3c61b5b262889..7f676b87274a8507a8ca25d8a71cf1e6a7fe1c00 100644 (file)
--- a/src/haikufont.c
+++ b/src/haikufont.c
@@ -1109,10 +1109,12 @@ in the font selection dialog.  */)
     error ("Trying to use a menu from within a menu-entry");
 
   popup_activated_p++;
+  unrequest_sigio ();
   rc = be_select_font (process_pending_signals,
                       haikufont_should_quit_popup,
                       &family, &style, &size,
                       !NILP (exclude_proportional));
+  request_sigio ();
   popup_activated_p--;
 
   if (!rc)