From 15f02ba21432217f493048d300202ff993a076e1 Mon Sep 17 00:00:00 2001 From: justme-1968 Date: Mon, 14 Jan 2019 15:31:05 +0000 Subject: [PATCH] 39_alexa.pm: support DelayedShutdownFn git-svn-id: https://svn.fhem.de/fhem/trunk@18254 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/39_alexa.pm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/fhem/FHEM/39_alexa.pm b/fhem/FHEM/39_alexa.pm index 5ba5d34bb..54deacd62 100644 --- a/fhem/FHEM/39_alexa.pm +++ b/fhem/FHEM/39_alexa.pm @@ -28,6 +28,7 @@ alexa_Initialize($) $hash->{DefFn} = "alexa_Define"; $hash->{NotifyFn} = "alexa_Notify"; $hash->{UndefFn} = "alexa_Undefine"; + $hash->{DelayedShutdownFn} = "alexa_DelayedShutdownFn"; $hash->{ShutdownFn} = "alexa_Shutdown"; $hash->{SetFn} = "alexa_Set"; $hash->{GetFn} = "alexa_Get"; @@ -178,6 +179,20 @@ alexa_Undefine($$) return undef; } sub +alexa_DelayedShutdownFn($) +{ + my ($hash) = @_; + + if( $hash->{PID} ) { + $hash->{shutdown} = 1; + alexa_stopAlexaFHEM($hash); + + return 1; + } + + return undef; +} +sub alexa_Shutdown($) { my ($hash) = @_; @@ -698,8 +713,13 @@ alexa_stoppedAlexaFHEM($) CommandDelete(undef, $name); Log3 $name, 2, "$name: alexaFHEM deleted"; - } elsif( $hash->{start} ) { + } elsif( $hash->{shutdown} ) { + delete $hash->{shutdown}; + CancelDelayedShutdown($name); + + } elsif( $hash->{start} ) { alexa_startAlexaFHEM($hash) + } }