1 files changed, 8 insertions, 8 deletions
diff --git a/winsup/cygwin/fhandler.cc b/winsup/cygwin/fhandler.cc
index aa996ea56..1a18b7550 100644
--- a/winsup/cygwin/fhandler.cc
+++ b/winsup/cygwin/fhandler.cc
@@ -231,14 +231,9 @@ fhandler_base::raw_read (void *ptr, size_t& ulen)
       h = GetCurrentThread ();
       prio = GetThreadPriority (h);
       (void) SetThreadPriority (h, THREAD_PRIORITY_TIME_CRITICAL);
-      SetEvent (read_state);
+      signal_read_state (1);
     }
   BOOL res = ReadFile (get_handle (), ptr, len, (DWORD *) &ulen, 0);
-  if (read_state)
-    {
-      SetEvent (read_state);
-      (void) SetThreadPriority (h, prio);
-    }
   if (!res)
     {
       /* Some errors are not really errors.  Detect such cases here.  */
@@ -275,6 +270,11 @@ fhandler_base::raw_read (void *ptr, size_t& ulen)
 	  break;
 	}
     }
+  if (read_state)
+    {
+      signal_read_state (1);
+      (void) SetThreadPriority (h, prio);
+    }
 #undef bytes_read
 }
 
@@ -705,8 +705,8 @@ fhandler_base::read (void *in_ptr, size_t& len)
       goto out;
     }
 
-  raw_read (ptr + copied_chars, len);
   need_signal = false;
+  raw_read (ptr + copied_chars, len);
   if (!copied_chars)
     /* nothing */;
   else if ((ssize_t) len > 0)
@@ -775,7 +775,7 @@ fhandler_base::read (void *in_ptr, size_t& len)
 
 out:
   if (need_signal)
-    SetEvent (read_state);
+    signal_read_state (2);
 
   debug_printf ("returning %d, %s mode", len, rbinary () ? "binary" : "text");
   return;