From 2a7f1b726c2c84d3516509e06747c0912cdead3e Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Sun, 15 Jul 2012 07:44:25 +0000
Subject: [PATCH] Correct "Cannot load UNDEFINED module" message, if module X
 is buggy.

git-svn-id: https://svn.fhem.de/fhem/trunk@1726 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/fhem.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/fhem/fhem.pl b/fhem/fhem.pl
index e107bc8e6..9c8105697 100755
--- a/fhem/fhem.pl
+++ b/fhem/fhem.pl
@@ -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}) {
     my @m = grep { $modules{$_}{DefFn} || !$modules{$_}{LOADED} }
@@ -2533,13 +2535,14 @@ EventMapAsList($)
   return split($sc, $em);
 }
 
+#######################
 # $dir: 0 = User to Fhem (i.e. set), 1 = Fhem to User (i.e trigger)
 sub
 ReplaceEventMap($$$)
 {
   my ($dev, $str, $dir) = @_;
   my $em = $attr{$dev}{eventMap};
-  return $str if(!$em);
+  return $str if(!$em || (!$dir && $str->[1] eq "?"));
   my $dname = shift @{$str} if(!$dir);
 
   my $nstr = join(" ", @{$str}) if(!$dir);