From 11d95285dad2faee66795239df083d5434f892e6 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Tue, 1 May 2007 06:44:59 +0000
Subject: [PATCH] Bugfix for disabled notify

git-svn-id: https://svn.fhem.de/fhem/trunk@57 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/CHANGED           | 4 +++-
 fhem/FHEM/91_notify.pm | 2 +-
 fhem/test/fhem.save    | 6 ++++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/fhem/CHANGED b/fhem/CHANGED
index 8d4dc4f01..0a691f747 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -324,6 +324,8 @@
 - ==DATE== (4.1)
   - doc:     linux.html (private udev-rules, not 50-..., ATTRS)
   - bugfix:  setting devices with "-" in their name did not work
-  - doc:     fhem.pl and commandref.html (notifyon -> notify, correction of examples)
+  - doc:     fhem.pl and commandref.html (notifyon -> notify, correction
+             of examples)
   - feature: modify command added
   - feature: The "-" in the name is not allowed any more
+  - bugfix:  disabled notify causes "uninitialized value" (STefan, 1.5)
diff --git a/fhem/FHEM/91_notify.pm b/fhem/FHEM/91_notify.pm
index d9a34ae97..5a73caa1b 100755
--- a/fhem/FHEM/91_notify.pm
+++ b/fhem/FHEM/91_notify.pm
@@ -50,7 +50,7 @@ notify_Exec($$)
   my ($log, $dev) = @_;
 
   my $ln = $log->{NAME};
-  return if($attr{$ln} && $attr{$ln}{disable});
+  return "" if($attr{$ln} && $attr{$ln}{disable});
 
   my $n = $dev->{NAME};
   my $re = $log->{REGEXP};
diff --git a/fhem/test/fhem.save b/fhem/test/fhem.save
index 869d678de..b99166713 100644
--- a/fhem/test/fhem.save
+++ b/fhem/test/fhem.save
@@ -1,4 +1,4 @@
-#Tue Apr 24 09:13:44 2007
+#Tue May  1 08:43:03 2007
 setstate FHZ fhtbuf: 1c
 setstate FHZ 2006-02-12 14:03:39 fhtbuf 23
 setstate FHZ 2006-03-26 08:47:36 init2 deadbeefdeadbe
@@ -32,15 +32,17 @@ setstate fl 2006-03-26 08:50:55 unknown_85 4
 setstate fl 2006-03-26 08:50:46 wed-from1 06:00
 setstate fl 2006-03-26 08:50:46 wed-to1 23:00
 setstate fl 2006-03-26 08:50:55 windowopen-temp 12.0 (Celsius)
+setstate floor.lamp ???
 setstate global <no definition>
 setstate marqee on
 setstate marqee 2006-04-01 12:46:02 state on
-setstate n_btn4 active
+setstate n_btn4 disabled
 setstate tf1 T: 20.3  H: 31.3  Bat: ok
 setstate tf1 2006-04-11 09:48:48 battery Bat: ok
 setstate tf1 2006-04-11 09:48:48 humidity 31.3 (%)
 setstate tf1 2006-04-11 09:48:48 temperature 20.3 (Celsius)
 setstate tf1 2006-04-11 09:48:48 type HMS100TF
+setstate window.lamp ???
 setstate wz measured-temp: 22.4 (Celsius)
 setstate wz 2006-03-29 23:04:17 actuator 00%
 setstate wz 2006-03-26 08:52:30 day-temp 22.0 (Celsius)