safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-08 06:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-229: Merge fix for improper clearing of XHR polling interval.

Browse Source
This commit is contained in:
Michael Jumper
2017-03-02 11:47:53 -08:00
parent 3ec99cbcdd b5bd316dfd
commit 865ec19704
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
guacamole-common-js/src/main/webapp/modules/Tunnel.js
View File

@@ -393,7 +393,7 @@ Guacamole.HTTPTunnel = function(tunnelURL, crossDomain) {
if (pollingMode === POLLING_ENABLED) { if (pollingMode === POLLING_ENABLED) {
if (xmlhttprequest.readyState === 3 && !interval) if (xmlhttprequest.readyState === 3 && !interval)
interval = setInterval(parseResponse, 30); interval = setInterval(parseResponse, 30);
else if (xmlhttprequest.readyState === 4 && !interval) else if (xmlhttprequest.readyState === 4 && interval)
clearInterval(interval); clearInterval(interval);
} }
@@ -461,7 +461,7 @@ Guacamole.HTTPTunnel = function(tunnelURL, crossDomain) {
if (length === 0) { if (length === 0) {
// Clean up interval if polling // Clean up interval if polling
if (!interval) if (interval)
clearInterval(interval); clearInterval(interval);
// Clean up object // Clean up object