From 021b496837e728c9e5c99ae9ff0c614ca263b36a Mon Sep 17 00:00:00 2001
From: markusbloch <markusbloch@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Tue, 19 Jan 2016 16:45:31 +0000
Subject: [PATCH] FB_CALLLIST: move validation of defined FB_CALLMONITOR to
 NofiyFn.

git-svn-id: https://svn.fhem.de/fhem/trunk@10575 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/72_FB_CALLLIST.pm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/fhem/FHEM/72_FB_CALLLIST.pm b/fhem/FHEM/72_FB_CALLLIST.pm
index ddf84bdc2..05702008a 100755
--- a/fhem/FHEM/72_FB_CALLLIST.pm
+++ b/fhem/FHEM/72_FB_CALLLIST.pm
@@ -76,15 +76,16 @@ sub FB_CALLLIST_Define($$)
     my $name = $a[0];
     my $callmonitor = $a[2];
     
-    return "FB_CALLLIST_define: you must specify a device name for using FB_CALLLIST" if(!defined($callmonitor));
+    return "wrong define syntax: you must specify a device name for using FB_CALLLIST" if(!defined($callmonitor));
     return "wrong define syntax: define <name> FB_CALLLIST <name>" if(@a != 3);
-    return "FB_CALLLIST_define: the selected device $callmonitor does not exist." unless(defined($defs{$callmonitor}));
-
-    unless($defs{$callmonitor}->{TYPE} eq "FB_CALLMONITOR")
+    
+    if($init_done)
     {
-        Log3 $name, 3, "FB_CALLLIST ($name) - WARNING - selected device $callmonitor ist not of type FB_CALLMONITOR";
-    }
+        return "define error: the selected device $callmonitor does not exist." unless(defined($defs{$callmonitor}));
 
+        Log3 $name, 3, "FB_CALLLIST ($name) - WARNING - selected device $callmonitor ist not of type FB_CALLMONITOR" unless($defs{$callmonitor}->{TYPE} eq "FB_CALLMONITOR");
+    }
+    
     $hash->{FB} = $callmonitor;
     $hash->{NOTIFYDEV} = "global,".$callmonitor;
     $hash->{STATE} = 'Initialized';
@@ -268,6 +269,11 @@ sub FB_CALLLIST_Notify($$)
     {
         if(grep(m/^(?:ATTR $name .*|DELETEATTR $name .*|INITIALIZED|REREADCFG)$/, @{$d->{CHANGED}}))
         {
+            my $callmonitor = $hash->{FB};
+            
+            Log3 $name, 3, "FB_CALLLIST ($name) - WARNING - the selected device $callmonitor does not exist" unless(defined($defs{$callmonitor}));
+            Log3 $name, 3, "FB_CALLLIST ($name) - WARNING - selected device $callmonitor ist not of type FB_CALLMONITOR" if(defined($defs{$callmonitor}) and $defs{$callmonitor}->{TYPE} ne "FB_CALLMONITOR");
+
             # delete all outdated calls according to attribute list-type, internal-number-filter and number-of-calls
             FB_CALLLIST_cleanupList($hash);