diff --git a/fhem/FHEM/00_MQTT2_SERVER.pm b/fhem/FHEM/00_MQTT2_SERVER.pm index c0fcc387e..63feb55eb 100644 --- a/fhem/FHEM/00_MQTT2_SERVER.pm +++ b/fhem/FHEM/00_MQTT2_SERVER.pm @@ -541,6 +541,10 @@ MQTT2_SERVER_doPublish($$$$;$) $src = $server if(!defined($src)); my $now = gettimeofday(); + my $serverName = $server->{NAME}; + my $ir = AttrVal($serverName, "ignoreRegexp", undef); + return if(defined($ir) && "$tp:$val" =~ m/$ir/); + if($retain) { if(!defined($val) || $val eq "") { delete($server->{retain}{$tp}); @@ -561,10 +565,6 @@ MQTT2_SERVER_doPublish($$$$;$) MQTT2_SERVER_sendto($server, $defs{$clName}, $tp, $val); } - my $serverName = $server->{NAME}; - my $ir = AttrVal($serverName, "ignoreRegexp", undef); - return if(defined($ir) && "$tp:$val" =~ m/$ir/); - my $cid = $src->{cid}; $tp =~ s/:/_/g if(AttrVal($serverName, "topicConversion", 1)); # 96608 if(defined($cid) || # "real" MQTT client @@ -873,7 +873,10 @@ MQTT2_SERVER_ReadDebug($$)