Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

DevIo.pm: fix reattach handling of ser2net device (Forum #54732)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@11693 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2016-06-19 10:21:42 +00:00
parent ea96ed747c
commit 98dc2bdced
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
FHEM/DevIo.pm
View File

@ -373,25 +373,34 @@ DevIo_OpenDev($$$)
$po->write_settings; $po->write_settings;
} }
DevIo_setStates($hash, "opened");
my $ret;
if($initfn) {
my $hadFD = defined($hash->{FD});
$ret = &$initfn($hash);
if($ret) {
if($hadFD && !defined($hash->{FD})) { # Forum #54732 / ser2net
DevIo_Disconnected($hash);
$hash->{NEXT_OPEN} = time()+60;
} else {
DevIo_CloseDev($hash);
Log3 $name, 1, "Cannot init $dev, ignoring it ($name)";
}
}
}
if(!$ret) {
if($reopen) { if($reopen) {
Log3 $name, 1, "$dev reappeared ($name)"; Log3 $name, 1, "$dev reappeared ($name)";
} else { } else {
Log3 $name, 3, "$name device opened" if(!$hash->{DevioText}); Log3 $name, 3, "$name device opened" if(!$hash->{DevioText});
} }
DevIo_setStates($hash, "opened");
my $ret;
if($initfn) {
my $ret = &$initfn($hash);
if($ret) {
DevIo_CloseDev($hash);
Log3 $name, 1, "Cannot init $dev, ignoring it ($name)";
}
} }
DoTrigger($name, "CONNECTED") if($reopen); DoTrigger($name, "CONNECTED") if($reopen && !$ret);
return $ret; return undef;
} }
sub sub