From 8d9714bc7add336018e04932f9b5aa55930083d7 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Tue, 1 Dec 2020 12:52:03 +0000 Subject: [PATCH] 00_MQTT2_SERVER.pm: do not send retained topics to deleted dev (Forum #114425) git-svn-id: https://svn.fhem.de/fhem/trunk@23269 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_MQTT2_SERVER.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fhem/FHEM/00_MQTT2_SERVER.pm b/fhem/FHEM/00_MQTT2_SERVER.pm index 926e799ee..12a8c2cb6 100644 --- a/fhem/FHEM/00_MQTT2_SERVER.pm +++ b/fhem/FHEM/00_MQTT2_SERVER.pm @@ -381,6 +381,7 @@ MQTT2_SERVER_Read($@) if(!$hash->{answerScheduled}) { $hash->{answerScheduled} = 1; InternalTimer($hash->{lastMsgTime}+1, sub(){ + return if(!$hash->{FD}); # Closed in the meantime, #114425 delete($hash->{answerScheduled}); my $r = $defs{$sname}{retain}; foreach my $tp (sort { $r->{$a}{ts} <=> $r->{$b}{ts} } keys %{$r}) { @@ -488,7 +489,7 @@ MQTT2_SERVER_sendto($$$$) my ($shash, $hash, $topic, $val) = @_; return if(IsDisabled($hash->{NAME})); $val = "" if(!defined($val)); - my $dump = (AttrVal($shash->{NAME},"verbose",1) >= 5) ? $shash->{NAME} :undef; + my $dump = (AttrVal($shash->{NAME},"verbose",1)>=5) ? $shash->{NAME} :undef; foreach my $s (keys %{$hash->{subscriptions}}) { my $re = $s; $re =~ s,^#$,.*,g;