mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-03 10:46:53 +00:00
Fix when using different FHEMWEB instances with longpoll
git-svn-id: https://svn.fhem.de/fhem/trunk@1042 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
23f15e0c41
commit
3f81330793
@ -1736,17 +1736,18 @@ FW_Notify($$)
|
|||||||
return undef if(AttrVal($dn, "room", "") ne $filter);
|
return undef if(AttrVal($dn, "room", "") ne $filter);
|
||||||
|
|
||||||
FW_ReadIcons();
|
FW_ReadIcons();
|
||||||
|
|
||||||
|
my @old = ($FW_wname, $FW_ME, $FW_longpoll, $FW_ss, $FW_tp);
|
||||||
$FW_wname = $ntfy->{SNAME};
|
$FW_wname = $ntfy->{SNAME};
|
||||||
$FW_ME = "/" . AttrVal($FW_wname, "webname", "fhem");
|
$FW_ME = "/" . AttrVal($FW_wname, "webname", "fhem");
|
||||||
$FW_longpoll = 1;
|
$FW_longpoll = 1;
|
||||||
$FW_ss = AttrVal($FW_wname, "smallscreen", 0);
|
$FW_ss = AttrVal($FW_wname, "smallscreen", 0);
|
||||||
$FW_tp = AttrVal($FW_wname, "touchpad", $FW_ss);
|
$FW_tp = AttrVal($FW_wname, "touchpad", $FW_ss);
|
||||||
|
|
||||||
my ($allSet, $hasOnOff, $txt) = FW_devState($dn, "");
|
my ($allSet, $hasOnOff, $txt) = FW_devState($dn, "");
|
||||||
|
($FW_wname, $FW_ME, $FW_longpoll, $FW_ss, $FW_tp) = @old;
|
||||||
|
|
||||||
$ntfy->{INFORMBUF} = "" if(!defined($ntfy->{INFORMBUF}));
|
$ntfy->{INFORMBUF} = "" if(!defined($ntfy->{INFORMBUF}));
|
||||||
$ntfy->{INFORMBUF} .= "$dn;$dev->{STATE};$txt\n";
|
$ntfy->{INFORMBUF} .= "$dn;$dev->{STATE};$txt\n";
|
||||||
Log 0, "Sending $txt";
|
|
||||||
RemoveInternalTimer($ln);
|
RemoveInternalTimer($ln);
|
||||||
InternalTimer(gettimeofday()+0.1, "FW_FlushInform", $ln, 0);
|
InternalTimer(gettimeofday()+0.1, "FW_FlushInform", $ln, 0);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user