From c866c56b829b652b37583dcb60ae9a6eb8e3ff8a Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Fri, 9 Oct 2015 13:18:20 +0200 Subject: [PATCH] =?UTF-8?q?Automatisches=20l=C3=B6schen=20der=20Bridge=20e?= =?UTF-8?q?inbearbeitet=20wenn=20das=20letzte=20AMAD=20Host=20Device=20gel?= =?UTF-8?q?=C3=B6scht=20wurde?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 74_AMAD.pm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/74_AMAD.pm b/74_AMAD.pm index eb675b5..b665408 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -35,7 +35,7 @@ use Time::HiRes qw(gettimeofday); use HttpUtils; use TcpServerUtils; -my $version = "0.7.5"; +my $version = "0.7.6"; @@ -98,7 +98,7 @@ sub AMAD_Define($$) { AMAD_CommBridge_Open( $hash ); } else { - if( ! $modules{AMAD}{defptr}{BRIDGE} ) { + if( ! $modules{AMAD}{defptr}{BRIDGE} && $init_done ) { CommandDefine( undef, "AMADCommBridge AMAD" ); } @@ -122,15 +122,20 @@ sub AMAD_Undef($$) { if( $hash->{BRIDGE} ) { delete $modules{AMAD}{defptr}{BRIDGE}; - my $ret = TcpServer_Close( $hash ); return $ret; } else { delete $modules{AMAD}{defptr}{$hash->{HOST}}; - RemoveInternalTimer( $hash ); - + + foreach my $d(sort keys %{$modules{AMAD}{defptr}}) { + my $hash = $modules{AMAD}{defptr}{$d}; + my $host = $hash->{HOST}; + + return if( $host ); + CommandDelete( undef, "AMADCommBridge" ); + } } } @@ -1242,4 +1247,4 @@ sub AMAD_CommBridge_Read($) { =end html_DE -=cut +=cut \ No newline at end of file