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

HUP missed to call UndefFn in RereadCfg

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2459 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2013-01-09 09:14:30 +00:00
parent b6bcfb95fb
commit bbcba3f90e
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fhem/fhem.pl
View File

@ -898,7 +898,7 @@ sub
CommandRereadCfg($$) CommandRereadCfg($$)
{ {
my ($cl, $param) = @_; my ($cl, $param) = @_;
my $name = $cl->{NAME} if($cl); my $name = ($cl ? $cl->{NAME} : "__anonymous__");
my $cfgfile = ($param ? $param : $attr{global}{configfile}); my $cfgfile = ($param ? $param : $attr{global}{configfile});
return "Cannot open $cfgfile: $!" if(! -f $cfgfile); return "Cannot open $cfgfile: $!" if(! -f $cfgfile);
@ -907,7 +907,6 @@ CommandRereadCfg($$)
$reread_active=1; $reread_active=1;
$init_done = 0; $init_done = 0;
foreach my $d (sort { $defs{$b}{NR} <=> $defs{$a}{NR} } keys %defs) { foreach my $d (sort { $defs{$b}{NR} <=> $defs{$a}{NR} } keys %defs) {
my $ret = CallFn($d, "UndefFn", $defs{$d}, $d) my $ret = CallFn($d, "UndefFn", $defs{$d}, $d)
if($name && $name ne $d); if($name && $name ne $d);
@ -932,7 +931,7 @@ CommandRereadCfg($$)
$ret = (defined($ret) ? "$ret\n$ret2" : $ret2) if(defined($ret2)); $ret = (defined($ret) ? "$ret\n$ret2" : $ret2) if(defined($ret2));
} }
DoTrigger("global", "REREADCFG"); DoTrigger("global", "REREADCFG");
$defs{$name} = $selectlist{$name} = $cl if($name); $defs{$name} = $selectlist{$name} = $cl if($name && $name ne "__anonymous__");
$init_done = 1; $init_done = 1;
$reread_active=0; $reread_active=0;