Skip to content

Commit

Permalink
Merge pull request novnc#285 from glance-/rfb_js_fixes
Browse files Browse the repository at this point in the history
Rfb js fixes
  • Loading branch information
kanaka committed Aug 26, 2013
2 parents 292f6a5 + c39df03 commit 3cb89f5
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions include/rfb.js
Original file line number Diff line number Diff line change
Expand Up @@ -403,7 +403,7 @@ updateState = function(state, statusMsg) {
}

if (msgTimer) {
clearInterval(msgTimer);
clearTimeout(msgTimer);
msgTimer = null;
}

Expand Down Expand Up @@ -444,13 +444,13 @@ updateState = function(state, statusMsg) {

if (connTimer && (rfb_state !== 'connect')) {
Util.Debug("Clearing connect timer");
clearInterval(connTimer);
clearTimeout(connTimer);
connTimer = null;
}

if (disconnTimer && (rfb_state !== 'disconnect')) {
Util.Debug("Clearing disconnect timer");
clearInterval(disconnTimer);
clearTimeout(disconnTimer);
disconnTimer = null;
}

Expand Down

0 comments on commit 3cb89f5

Please sign in to comment.