mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OWTHERM_GetValues: fix returnvalue

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6269 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess
2014-07-17 11:14:55 +00:00
parent 3831599ad5
commit 2e123f183c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fhem/FHEM/00_OWX_ASYNC.pm
View File

@@ -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;

2
fhem/FHEM/21_OWTHERM.pm
View File

@@ -1032,7 +1032,7 @@ sub OWXTHERM_GetValues($) {
eval {
OWXTHERM_BinValues($hash,undef,$owx_dev,undef,undef,substr($res,10,9));
};
return $@;
return $@ ? $@ : undef;
}
#######################################################################################