summaryrefslogtreecommitdiff
path: root/win32/win32.c
diff options
context:
space:
mode:
Diffstat (limited to 'win32/win32.c')
-rw-r--r--win32/win32.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/win32/win32.c b/win32/win32.c
index 3b49ecaa85..5fd4678383 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -520,6 +520,18 @@ FindChildSlot(rb_pid_t pid)
return NULL;
}
+static struct ChildRecord *
+FindChildSlotByHandle(HANDLE h)
+{
+
+ FOREACH_CHILD(child) {
+ if (child->hProcess == h) {
+ return child;
+ }
+ } END_FOREACH_CHILD;
+ return NULL;
+}
+
static void
CloseChildHandle(struct ChildRecord *child)
{
@@ -2784,7 +2796,7 @@ waitpid(rb_pid_t pid, int *stat_loc, int options)
return -1;
}
- return poll_child_status(ChildRecord + ret, stat_loc);
+ return poll_child_status(FindChildSlotByHandle(events[ret]), stat_loc);
}
else {
struct ChildRecord* child = FindChildSlot(pid);