[gnome-builder] libide/threading: always merge down mapped FD
- From: Christian Hergert <chergert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-builder] libide/threading: always merge down mapped FD
- Date: Wed, 20 Jul 2022 01:40:12 +0000 (UTC)
commit 3044efbc7e31c0410707806f1528db88523f3700
Author: Christian Hergert <chergert redhat com>
Date: Tue Jul 19 18:31:58 2022 -0700
libide/threading: always merge down mapped FD
Even if the source_fd is -1, we still want to keep merging it to a lower
layer so that it ends up in the final IdeUnixFDMap.
This also fixes a situation with a few runtimes that were not silencing
stdout when running `which` even though they expected to.
src/libide/threading/ide-unix-fd-map.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/src/libide/threading/ide-unix-fd-map.c b/src/libide/threading/ide-unix-fd-map.c
index 6374bf4a3..618bd41a6 100644
--- a/src/libide/threading/ide-unix-fd-map.c
+++ b/src/libide/threading/ide-unix-fd-map.c
@@ -414,9 +414,9 @@ ide_unix_fd_map_steal_from (IdeUnixFDMap *self,
return FALSE;
}
}
-
- ide_unix_fd_map_take (self, ide_steal_fd (&item->source_fd), item->dest_fd);
}
+
+ ide_unix_fd_map_take (self, ide_steal_fd (&item->source_fd), item->dest_fd);
}
return TRUE;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]