summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2016-05-16 12:57:04 +0200
committerRalf Habacker <ralf.habacker@freenet.de>2016-05-16 12:57:04 +0200
commitc126716adacb8fb404283d9ca3d81568a038e54b (patch)
tree7b76a47028601b9c0b0712e2fd09c635f3b913ef
parent5ef8b4dc59bbab50b9e898ec886b234147e4b23d (diff)
parent7bcaf35bcaf8d594950df9b4a92b6f822ebfcabc (diff)
Merge branch 'dbus-1.10'
-rw-r--r--dbus/dbus-spawn-win.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/dbus/dbus-spawn-win.c b/dbus/dbus-spawn-win.c
index 3ae5749c..119bfd1e 100644
--- a/dbus/dbus-spawn-win.c
+++ b/dbus/dbus-spawn-win.c
@@ -603,16 +603,20 @@ babysitter (void *parameter)
{
int ret = 0;
DBusBabysitter *sitter = (DBusBabysitter *) parameter;
+ HANDLE handle;
PING();
_dbus_verbose ("babysitter: spawning %s\n", sitter->log_name);
PING();
- sitter->child_handle = spawn_program (sitter->log_name,
- sitter->argv, sitter->envp);
+ handle = spawn_program (sitter->log_name, sitter->argv, sitter->envp);
PING();
- if (sitter->child_handle == (HANDLE) -1)
+ if (handle != INVALID_HANDLE_VALUE)
+ {
+ sitter->child_handle = handle;
+ }
+ else
{
sitter->child_handle = NULL;
sitter->have_spawn_errno = TRUE;