Fixes issue with not completing promise for remove/add track and conference leave

JitsiConference.js

@@ -87,6 +87,21 @@ JitsiConference.prototype.isJoined = function () {
     return this.room && this.room.joined;
 };
 
+/**
+ * Leaves the conference and calls onMemberLeft for every participant.
+ */
+JitsiConference.prototype._leaveRoomAndRemoveParticipants = function () {
+    // leave the conference
+    if (this.room) {
+        this.room.leave();
+    }
+
+    this.room = null;
+    // remove all participants
+    this.getParticipants().forEach(function (participant) {
+        this.onMemberLeft(participant.getJid());
+    }.bind(this));
+}
 /**
  * Leaves the conference.
  * @returns {Promise}
@@ -98,18 +113,14 @@ JitsiConference.prototype.leave = function () {
         conference.getLocalTracks().map(function (track) {
             return conference.removeTrack(track);
         })
-    ).then(function () {
-        // leave the conference
-        if (conference.room) {
-            conference.room.leave();
-        }
-
-        conference.room = null;
-        // remove all participants
-        conference.getParticipants().forEach(function (participant) {
-            conference.onMemberLeft(participant.getJid());
-        });
-    });
+    ).then(this._leaveRoomAndRemoveParticipants.bind(this))
+    .catch(function (error) {
+        logger.error(error);
+        // We are proceeding with leaving the conference because room.leave may
+        // succeed.
+        this._leaveRoomAndRemoveParticipants();
+        return Promise.resolve();
+    }.bind(this));
 };
 
 /**

modules/xmpp/JingleSessionPC.js

@@ -943,6 +943,11 @@ JingleSessionPC.prototype.addStream = function (stream, callback, ssrcInfo,
         return;
     }
 
+    if(this.modifySourcesQueue.paused) {
+        throw new Error("modifySourcesQueue paused");
+        return;
+    }
+
     this.modifyingLocalStreams = true;
     var self = this;
     this.modifySourcesQueue.push(function() {
@@ -985,8 +990,10 @@ JingleSessionPC.prototype.removeStream = function (stream, callback, ssrcInfo) {
         }
         if (RTCBrowserType.getBrowserType() ===
                 RTCBrowserType.RTC_BROWSER_FIREFOX) {
-            if(!stream)//There is nothing to be changed
+            if(!stream) {//There is nothing to be changed
+                callback();
                 return;
+            }
             var sender = null;
             // On Firefox we don't replace MediaStreams as this messes up the
             // m-lines (which can't be removed in Plan Unified) and brings a lot
@@ -1002,6 +1009,7 @@ JingleSessionPC.prototype.removeStream = function (stream, callback, ssrcInfo) {
 
             if(!track) {
                 logger.log("Cannot remove tracks: no tracks.");
+                callback();
                 return;
             }
 
@@ -1032,6 +1040,11 @@ JingleSessionPC.prototype.removeStream = function (stream, callback, ssrcInfo) {
         return;
     }
 
+    if(this.modifySourcesQueue.paused) {
+        throw new Error("modifySourcesQueue paused");
+        return;
+    }
+
     this.modifyingLocalStreams = true;
     var self = this;
     this.modifySourcesQueue.push(function() {