FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

74_AMAD: fix FHEM Crash when use AMAD and apptime togehter

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12298 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
markooldenburg 2016-10-08 20:05:13 +00:00
parent 5a471e2922
commit 19b9b22925
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,6 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it.
- bugfix: 74_AMAD: fix FHEM crash when use AMAD and apptime togehter
- new: 98_TRAFFIC: provide traffic details with Google Distance API
- feature: 98_Hyperion: set configFile only available if at least two files
are found while get configFiles

8
fhem/FHEM/74_AMAD.pm
View File

@ -37,7 +37,7 @@ use TcpServerUtils;
use Encode qw(encode);
my $modulversion = "2.6.3";
my $modulversion = "2.6.4";
my $flowsetversion = "2.6.4";
@ -139,8 +139,8 @@ sub AMAD_Undef($$) {
my ( $hash, $arg ) = @_;
if( $hash->{BRIDGE} ) {
delete $modules{AMAD}{defptr}{BRIDGE} if(defined($modules{AMAD}{defptr}{BRIDGE}));
if( $hash->{BRIDGE} or $hash->{TEMPORARY} == 1 ) {
delete $modules{AMAD}{defptr}{BRIDGE} if( defined($modules{AMAD}{defptr}{BRIDGE}) and $hash->{BRIDGE} );
TcpServer_Close( $hash );
}
@ -259,7 +259,7 @@ sub AMAD_Attr(@) {
sub AMAD_GetUpdate($) {
my ( $hash ) = @_;
my ( $hash ) = @_;
my $name = $hash->{NAME};
my $bhash = $modules{AMAD}{defptr}{BRIDGE};
my $bname = $bhash->{NAME};