FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-16 10:46:03 +00:00
Code Issues Releases Wiki Activity

Bugifx: wrong inform data when notifies generate additional device events

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1299 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-02-27 16:59:42 +00:00
parent b13aca08c8
commit 97886b4b72
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/fhem.pl
View File

@ -1224,7 +1224,6 @@ CommandDefine($$)
my ($cl, $def) = @_;
my @a = split("[ \t][ \t]*", $def, 3);
my $name = $a[0];
return "Usage: define <name> <type> <type dependent arguments>"
if(int(@a) < 2);
return "$name already defined, delete it first" if(defined($defs{$name}));
@ -2157,7 +2156,11 @@ DoTrigger($$)
return "" if(!defined($defs{$dev}));
if(defined($ns)) {
if($defs{$dev}{CHANGED}) {
push @{$defs{$dev}{CHANGED}}, $ns;
} else {
$defs{$dev}{CHANGED}[0] = $ns;
}
} elsif(!defined($defs{$dev}{CHANGED})) {
return "";
}
@ -2192,8 +2195,6 @@ DoTrigger($$)
my $r = CallFn($n, "NotifyFn", $defs{$n}, $defs{$dev});
$ret .= $r if($r);
}
delete($defs{$dev}{INTRIGGER});
}
################
# Inform
@ -2217,6 +2218,9 @@ DoTrigger($$)
}
}
delete($defs{$dev}{INTRIGGER});
}
####################
# Used by triggered perl programs to check the old value