From 8a0610e8714b6c312493bebba171c22a755d8be3 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Thu, 3 Apr 2014 07:33:42 +0000 Subject: [PATCH] notify: set STATE after executing the commands. git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@5418 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/91_notify.pm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fhem/FHEM/91_notify.pm b/fhem/FHEM/91_notify.pm index 2a08d8697..ce8b476c3 100755 --- a/fhem/FHEM/91_notify.pm +++ b/fhem/FHEM/91_notify.pm @@ -70,9 +70,6 @@ notify_Exec($$) $found = ("$n:$s" =~ m/^$re$/); } if($found) { - $ntfy->{STATE} = - AttrVal($ln,'showTriggerTime',1) ? $dev->{NTFY_TRIGGERTIME} : 'active'; - Log3 $ln, 5, "Triggering $ln"; my (undef, $exec) = split("[ \t]+", $ntfy->{DEF}, 2); @@ -89,6 +86,9 @@ notify_Exec($$) $ret .= " $r" if($r); } } + $ntfy->{STATE} = + AttrVal($ln,'showTriggerTime',1) ? $dev->{NTFY_TRIGGERTIME} : 'active'; + return $ret if(AttrVal($ln, "forwardReturnValue", 0)); return undef; }