server: Do not cancel process sigkill in kill_process().

Signed-off-by: Paul Gofman <pgofman@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

server: Do not cancel process sigkill in kill_process().
df066eab · Paul Gofman · Alexandre Julliard · 2c94b7a6 · df066eab
Commit df066eab authored Mar 30, 2021 by Paul Gofman Committed by Alexandre Julliard Mar 31, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 7 deletions

process.c server/process.c +1 -7

No files found.
--- a/server/process.c
+++ b/server/process.c
@@ -945,13 +945,7 @@ void kill_process( struct process *process, int violent_death )
        process->msg_fd = NULL;
    }

-    if (process->sigkill_timeout)  /* already waiting for it to die */
-    {
-        remove_timeout_user( process->sigkill_timeout );
-        process->sigkill_timeout = NULL;
-        process_died( process );
-        return;
-    }
+    if (process->sigkill_timeout) return;  /* already waiting for it to die */

    if (violent_death) terminate_process( process, NULL, 1 );
    else