From 1a1e73dc5e8985ff1650ed94194a972af170a7ff Mon Sep 17 00:00:00 2001
From: ntruchsess <>
Date: Thu, 17 Jul 2014 11:14:55 +0000
Subject: [PATCH] OWTHERM_GetValues: fix returnvalue

git-svn-id: https://svn.fhem.de/fhem/trunk@6269 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/00_OWX_ASYNC.pm | 3 ++-
 fhem/FHEM/21_OWTHERM.pm   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fhem/FHEM/00_OWX_ASYNC.pm b/fhem/FHEM/00_OWX_ASYNC.pm
index 012e8b043..76a22de5d 100644
--- a/fhem/FHEM/00_OWX_ASYNC.pm
+++ b/fhem/FHEM/00_OWX_ASYNC.pm
@@ -993,8 +993,9 @@ sub OWX_ASYNC_PT_Execute($$$$$) {
 sub OWX_ASYNC_Schedule($$) {
   my ( $hash, $task ) = @_;
   my $master = $hash->{TYPE} eq "OWX_ASYNC" ? $hash : $hash->{IODev};
-  die "OWX_ASYNC_Schedule: Master not Active" unless $master->{STATE} eq "Active";
   my $name = $hash->{NAME};
+  Log3 ($master->{NAME},5,"OWX_ASYNC_Schedule master: ".$master->{NAME}.", task: ".$name);
+  die "OWX_ASYNC_Schedule: Master not Active" unless $master->{STATE} eq "Active";
   $task->{ExecuteTime} = gettimeofday() unless (defined $task->{ExecuteTime});
   if (defined $master->{tasks}->{$name}) {
     push @{$master->{tasks}->{$name}}, $task;
diff --git a/fhem/FHEM/21_OWTHERM.pm b/fhem/FHEM/21_OWTHERM.pm
index 08ac4838c..8b6b283fc 100644
--- a/fhem/FHEM/21_OWTHERM.pm
+++ b/fhem/FHEM/21_OWTHERM.pm
@@ -1032,7 +1032,7 @@ sub OWXTHERM_GetValues($) {
   eval {
     OWXTHERM_BinValues($hash,undef,$owx_dev,undef,undef,substr($res,10,9));
   };
-  return $@;
+  return $@ ? $@ : undef;
 }
 
 #######################################################################################