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

98_structure.pm: behave correctly when the structure definition order is strange (Forum #32493)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7652 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-01-21 18:59:58 +00:00
parent fcef72d497
commit 641af10299
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fhem/FHEM/98_structure.pm
View File

@ -66,7 +66,7 @@ structAdd($$)
} else {
addToDevAttrList($c, $attrList);
structAdd($c, $attrList) if($defs{$d}{TYPE} eq "structure");
structAdd($c, $attrList) if($defs{$d} && $defs{$d}{TYPE} eq "structure");
}
}
delete $defs{$d}{INstructAdd};
@ -89,12 +89,14 @@ structure_Define($$)
$hash->{ATTR} = $stype;
my %list;
my $attrList = "$stype ${stype}_map structexclude";
my $aList = "$stype ${stype}_map structexclude";
foreach my $a (@a) {
foreach my $d (devspec2array($a)) {
$list{$d} = 1;
addToDevAttrList($d, $attrList);
structAdd($d, $attrList) if($defs{$d}{TYPE} eq "structure");
if($init_done) {
addToDevAttrList($d, $aList);
structAdd($d, $aList) if($defs{$d} && $defs{$d}{TYPE} eq "structure");
}
}
}
$hash->{CONTENT} = \%list;