FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

FRITZBOX: bugfix - Crash if attr disable is set

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16285 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tupol 2018-02-27 17:58:54 +00:00
parent bc8e46047c
commit ba7e74b479
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/72_FRITZBOX.pm
View File

@ -318,10 +318,14 @@ sub FRITZBOX_Attr($@)
} }
} }
if ( $aName =~ /fritzBoxIP|m3uFileLocal|m3uFileURL/ && $hash->{APICHECKED} == 1 || $aName eq "disable" ) { # Stop the sub if FHEM is not initialized yet
return undef unless $init_done;
if ( $aName =~ /fritzBoxIP|m3uFileLocal|m3uFileURL/ && $hash->{APICHECKED} == 1
|| $aName eq "disable" ) {
$hash->{APICHECKED} = 0; $hash->{APICHECKED} = 0;
RemoveInternalTimer($hash->{helper}{TimerReadout}); RemoveInternalTimer($hash->{helper}{TimerReadout});
InternalTimer(gettimeofday(), "FRITZBOX_Readout_Start", $hash->{helper}{TimerReadout}, 1); InternalTimer(gettimeofday()+1, "FRITZBOX_Readout_Start", $hash->{helper}{TimerReadout}, 1);
# FRITZBOX_Readout_Start($hash->{helper}{TimerReadout}); # FRITZBOX_Readout_Start($hash->{helper}{TimerReadout});
} }
@ -657,7 +661,11 @@ sub FRITZBOX_Readout_Start($)
my $runFn; my $runFn;
my $disable = AttrVal( $name, "disable", 0 ); if( AttrVal( $name, "disable", 0 ) == 1 ) {
RemoveInternalTimer($hash->{helper}{TimerReadout});
readingsSingleUpdate( $hash, "state", "disabled", 1 );
return undef;
}
# Set timer value (min. 60) # Set timer value (min. 60)
$hash->{INTERVAL} = AttrVal( $name, "INTERVAL", $hash->{INTERVAL} ); $hash->{INTERVAL} = AttrVal( $name, "INTERVAL", $hash->{INTERVAL} );
@ -666,7 +674,7 @@ sub FRITZBOX_Readout_Start($)
my $interval = $hash->{INTERVAL}; my $interval = $hash->{INTERVAL};
# First run is an API check # First run is an API check
unless ( $hash->{APICHECKED} && ! $disable ) { unless ( $hash->{APICHECKED} ) {
$interval = 10; $interval = 10;
$hash->{STATE} = "Check APIs"; $hash->{STATE} = "Check APIs";
$runFn = "FRITZBOX_API_Check_Run"; $runFn = "FRITZBOX_API_Check_Run";
@ -680,10 +688,6 @@ sub FRITZBOX_Readout_Start($)
if( $interval != 0 ) { if( $interval != 0 ) {
RemoveInternalTimer($hash->{helper}{TimerReadout}); RemoveInternalTimer($hash->{helper}{TimerReadout});
InternalTimer(gettimeofday()+$interval, "FRITZBOX_Readout_Start", $hash->{helper}{TimerReadout}, 1); InternalTimer(gettimeofday()+$interval, "FRITZBOX_Readout_Start", $hash->{helper}{TimerReadout}, 1);
if( $disable ) {
readingsSingleUpdate( $hash, "state", "disabled", 1 );
return undef;
}
} }
# Kill running process if "set update" is used # Kill running process if "set update" is used