2
0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00

avoid crash at pairing

git-svn-id: https://svn.fhem.de/fhem/trunk@6142 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-06-19 16:39:19 +00:00
parent 386b10339d
commit 096c5f55eb

View File

@ -6446,8 +6446,13 @@ sub CUL_HM_UpdtCentral($){
map{InternalVal($_,"owner_CCU","") eq $name ? $_ : ""} map{InternalVal($_,"owner_CCU","") eq $name ? $_ : ""}
keys %defs); keys %defs);
my @l = grep !/^$/,
map{AttrVal($_,"IODev","")}
map{CUL_HM_id2Name($_)}
grep /^.{6}$/,
keys %{$modules{CUL_HM}{defptr}};
my @myIos;# get all IOs using 'my' ID my @myIos;# get all IOs using 'my' ID
foreach (CUL_HM_noDup(grep !/^$/,map{AttrVal($_,"IODev","")}keys %defs)){ foreach (CUL_HM_noDup(@l)) {
push @myIos,$_ if (CUL_HM_h2IoId($defs{$_}) eq $id); push @myIos,$_ if (CUL_HM_h2IoId($defs{$_}) eq $id);
} }
$defs{$name}{assignedIOs} = join(",",@myIos); $defs{$name}{assignedIOs} = join(",",@myIos);
@ -6477,7 +6482,7 @@ sub CUL_HM_UpdtCentral($){
CommandDefine(undef,$name."_Btn$btn CUL_HM $ccuBId") CommandDefine(undef,$name."_Btn$btn CUL_HM $ccuBId")
if (!$modules{CUL_HM}{defptr}{$ccuBId}); if (!$modules{CUL_HM}{defptr}{$ccuBId});
foreach my $pn (grep !/^$/,map{$_ if (AttrVal($_,"peerIDs","") =~ m/$id$btnS/)}keys %defs){ foreach my $pn (grep !/^$/,map{$_ if (AttrVal($_,"peerIDs","") =~ m/$id$btnS/)}keys %defs){
CUL_HM_ID2PeerList ($name."_Btn$btn",CUL_HM_name2Id($pn),1); CUL_HM_ID2PeerList ($name."_Btn$btn",CUL_HM_name2Id($pn),1);
} }
} }
my $io = AttrVal($name,"IODev","empty"); my $io = AttrVal($name,"IODev","empty");