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

98_structure.pm: even more checks for undefined devices (Forum #32493)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7655 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-21 19:27:54 +00:00
parent 663bbf5113
commit d92246ce78
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/98_structure.pm
View File

@ -59,9 +59,10 @@ sub
structAdd($$)
{
my ($d, $attrList) = @_;
return if(!$defs{$d});
$defs{$d}{INstructAdd} = 1;
foreach my $c (keys %{$defs{$d}{CONTENT}}) {
if($defs{$c}{INstructAdd}) {
if($defs{$c} && $defs{$c}{INstructAdd}) {
Log 1, "recursive structure definition"
} else {
@ -69,7 +70,7 @@ structAdd($$)
structAdd($c, $attrList) if($defs{$c} && $defs{$c}{TYPE} eq "structure");
}
}
delete $defs{$d}{INstructAdd};
delete $defs{$d}{INstructAdd} if($defs{$d});
}
#############################
@ -93,10 +94,8 @@ structure_Define($$)
foreach my $a (@a) {
foreach my $d (devspec2array($a)) {
$list{$d} = 1;
if($init_done) {
addToDevAttrList($d, $aList);
structAdd($d, $aList) if($defs{$d} && $defs{$d}{TYPE} eq "structure");
}
addToDevAttrList($d, $aList);
structAdd($d, $aList) if($defs{$d} && $defs{$d}{TYPE} eq "structure");
}
}
$hash->{CONTENT} = \%list;