From ade554ce828dcaed69ef5d5b67f70b9b444aab12 Mon Sep 17 00:00:00 2001 From: betateilchen Date: Fri, 6 Nov 2015 12:43:17 +0000 Subject: [PATCH] 55_GDS.pm: prevent problems after global rereadcfg git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@9794 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/55_GDS.pm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/55_GDS.pm b/fhem/FHEM/55_GDS.pm index 15a54a1b2..26821a65f 100644 --- a/fhem/FHEM/55_GDS.pm +++ b/fhem/FHEM/55_GDS.pm @@ -318,6 +318,7 @@ sub GDS_Undef($$) { sub GDS_Shutdown($) { my ($hash) = @_; my $name = $hash->{NAME}; + RemoveInternalTimer($hash); Log3 ($name,4,"GDS $name: shutdown requested"); return undef; } @@ -326,7 +327,8 @@ sub GDS_Notify ($$) { my ($hash,$dev) = @_; my $name = $hash->{NAME}; return if($dev->{NAME} ne "global"); - return if(!grep(m/^INITIALIZED|^REREAD/, @{$dev->{CHANGED}})); + my $type = $dev->{CHANGED}[0]; + return unless (grep(m/^INITIALIZED/, $type)); $aList = "disabled_by_attribute" unless AttrVal($name,'gdsUseAlerts',0); $fList = "disabled_by_attribute" unless AttrVal($name,'gdsUseForecasts',0); @@ -653,12 +655,6 @@ sub GDS_GetUpdate($;$) { $local //= 0; my $name = $hash->{NAME}; - - my $diff = int(time()) - $hash->{GDS_REREAD}; -#Debug "GDS_GetUpdate started Diff: $diff"; - return if( $diff < 60 ); -#Debug "GDS_GetUpdate continued"; - RemoveInternalTimer($hash); my $fs = AttrVal($name, "gdsSetForecast", 0);