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

Correct "Cannot load UNDEFINED module" message, if module X is buggy.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1726 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-07-15 07:44:25 +00:00
parent 18496049f8
commit 099c95f98a
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/fhem.pl
View File

@ -1203,7 +1203,9 @@ CommandDefine($$)
} }
} }
$m = LoadModule($m); my $newm = LoadModule($m);
return "Cannot load module $m" if($newm eq "UNDEFINED");
$m = $newm;
if(!$modules{$m} || !$modules{$m}{DefFn}) { if(!$modules{$m} || !$modules{$m}{DefFn}) {
my @m = grep { $modules{$_}{DefFn} || !$modules{$_}{LOADED} } my @m = grep { $modules{$_}{DefFn} || !$modules{$_}{LOADED} }
@ -2533,13 +2535,14 @@ EventMapAsList($)
return split($sc, $em); return split($sc, $em);
} }
#######################
# $dir: 0 = User to Fhem (i.e. set), 1 = Fhem to User (i.e trigger) # $dir: 0 = User to Fhem (i.e. set), 1 = Fhem to User (i.e trigger)
sub sub
ReplaceEventMap($$$) ReplaceEventMap($$$)
{ {
my ($dev, $str, $dir) = @_; my ($dev, $str, $dir) = @_;
my $em = $attr{$dev}{eventMap}; my $em = $attr{$dev}{eventMap};
return $str if(!$em); return $str if(!$em || (!$dir && $str->[1] eq "?"));
my $dname = shift @{$str} if(!$dir); my $dname = shift @{$str} if(!$dir);
my $nstr = join(" ", @{$str}) if(!$dir); my $nstr = join(" ", @{$str}) if(!$dir);