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

98_freezemon.pm: Fix of the fix of a bug which could cause FHEM to crash at startup in rare cases

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18133 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
KernSani 2019-01-04 13:55:38 +00:00
parent 8c3e7b9cc1
commit 78ef0f87f2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/98_freezemon.pm
View File

@ -321,7 +321,7 @@ sub freezemon_ProcessTimer($) {
} }
# prioQueues are not unique, so we are using the old way... # prioQueues are not unique, so we are using the old way...
if ( $hash->{helper}{apptime} ne "" ) { if ( $hash->{helper}{apptime} && $hash->{helper}{apptime} ne "" ) {
my @olddev = split( " ", $hash->{helper}{apptime} ); my @olddev = split( " ", $hash->{helper}{apptime} );
my @newdev = split( " ", freezemon_apptime($hash) ); my @newdev = split( " ", freezemon_apptime($hash) );
@ -707,7 +707,7 @@ sub freezemon_Attr($) {
if ( $aVal ne 0 ) { if ( $aVal ne 0 ) {
freezemon_install_callFn_wrapper($hash); freezemon_install_callFn_wrapper($hash);
} }
elsif ( exists ($hash->{helper}{mycallFn} ) ) { elsif ( defined ($hash->{helper}{mycallFn} ) ) {
Log3( "", 0, "[Freezemon] $name: Unwrapping CallFn" ); Log3( "", 0, "[Freezemon] $name: Unwrapping CallFn" );
{ {
no warnings; no warnings;
@ -722,7 +722,7 @@ sub freezemon_Attr($) {
if ( $aVal ne 0 ) { if ( $aVal ne 0 ) {
freezemon_install_analyzeCommand_wrapper($hash); freezemon_install_analyzeCommand_wrapper($hash);
} }
elsif ( exists( $hash->{helper}{analyzeCommand} ) ) { elsif ( defined ( $hash->{helper}{analyzeCommand} ) ) {
Log3( "", 0, "[Freezemon] $name: Unwrapping analyzeCommand" ); Log3( "", 0, "[Freezemon] $name: Unwrapping analyzeCommand" );
{ {
#no warnings; #no warnings;
@ -1047,7 +1047,7 @@ sub freezemon_install_analyzeCommand_wrapper($;$) {
$name = "FreezeMon" unless defined($name); $name = "FreezeMon" unless defined($name);
my $status = AnalyzeCommand( "freezemon", "" ); my $status = AnalyzeCommand( "freezemon", "" );
if ( !defined($status) || $status ne "already wrapped" ) { if ( !defined($status) || $status ne "already wrapped" ) {
$hash->{helper}{mycallFn} = \&AnalyzeCommand; $hash->{helper}{AnalyzeCommand} = \&AnalyzeCommand;
Log3( "", 3, "[Freezemon] $name: Wrapping AnalyzeCommand" ); Log3( "", 3, "[Freezemon] $name: Wrapping AnalyzeCommand" );
{ {
no warnings; no warnings;