summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <213943+nickvergessen@users.noreply.github.com>2018-11-29 17:38:24 +0100
committerGitHub <noreply@github.com>2018-11-29 17:38:24 +0100
commitb99ac0bd0e71a65e493fdd90dd54bf7c18875c4a (patch)
treeadd1972ac6fda19c9cf3dfd7e056be3580ce5615
parent7168c684afd29d0c28b9ad4c148dc590e52fbb4d (diff)
parent9c0c1da64a43e84edb74c696fb6ac991a0f9c700 (diff)
Merge pull request #1320 from nextcloud/fix-room-polling-not-stopped-when-leaving-the-current-room
Fix room polling not stopped when leaving the current room
-rw-r--r--js/signaling.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/js/signaling.js b/js/signaling.js
index 7633f9ad0..905278a21 100644
--- a/js/signaling.js
+++ b/js/signaling.js
@@ -540,8 +540,11 @@
this._startPullingMessages();
};
- OCA.Talk.Signaling.Internal.prototype._doLeaveRoom = function(/*token*/) {
- // Nothing to do anymore
+ OCA.Talk.Signaling.Internal.prototype._doLeaveRoom = function(token) {
+ if (token === this.currentRoomToken && !this.roomCollection) {
+ window.clearInterval(this.roomPoller);
+ this.roomPoller = null;
+ }
};
OCA.Talk.Signaling.Internal.prototype.sendCallMessage = function(data) {