Module: wine Branch: master Commit: df066eabdc896eb3ea249ee639d703875214250f URL: https://source.winehq.org/git/wine.git/?a=commit;h=df066eabdc896eb3ea249ee63...
Author: Paul Gofman pgofman@codeweavers.com Date: Tue Mar 30 20:32:13 2021 +0300
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/process.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/server/process.c b/server/process.c index 7bc096a7b1f..9ca1eb64469 100644 --- 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