From 8d20208431f86c71ebe6c30f5636273937e93af4 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Thu, 9 Nov 2017 14:34:29 +0000 Subject: [PATCH] Blocking.pm: fix some windows problems (Forum #79222) git-svn-id: https://svn.fhem.de/fhem/trunk@15412 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/Blocking.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/Blocking.pm b/fhem/FHEM/Blocking.pm index f50420042..09db5bda0 100644 --- a/fhem/FHEM/Blocking.pm +++ b/fhem/FHEM/Blocking.pm @@ -187,7 +187,7 @@ BlockingStart(;$) # Child here BlockingInformParent("BlockingRegisterTelnet", "\$cl,$h->{bc_pid}", 1, 1) - if($h->{abortFn}); + if($h->{abortFn} && $^O !~ m/Win/); no strict "refs"; my $ret = &{$h->{fn}}($h->{arg}); use strict "refs"; @@ -272,7 +272,7 @@ BlockingKill($) return if($h->{terminated}); - if($^O !~ m/Win/) { +# if($^O !~ m/Win/) { if($h->{pid} && $h->{pid} !~ m/:/ && kill(9, $h->{pid})) { my $ll = (defined($h->{loglevel}) ? $h->{loglevel} : 1); # Forum #77057 Log $ll, "Timeout for $h->{fn} reached, terminated process $h->{pid}"; @@ -289,10 +289,11 @@ BlockingKill($) use strict "refs"; } + delete($BC_hash{$h->{bc_pid}}); InternalTimer(gettimeofday()+1, "BlockingStart", \%BC_hash, 0) if(looks_like_number($h->{pid}) && kill(0, $h->{pid})); # Forum #58867 } - } +# } BlockingStart(); }