Merge pull request #2950 from nextcloud/bugfix/noid/await-the-leave-call-before-leaving-the-conversation

Await that the call was left before leaving the conversation

src/utils/signaling.js

@@ -250,24 +250,25 @@ Signaling.Base.prototype._leaveRoomSuccess = function(/* token */) {
 
 Signaling.Base.prototype.leaveRoom = function(token) {
 	this.leaveCurrentCall()
-
-	this._trigger('leaveRoom', [token])
-	this._doLeaveRoom(token)
-
-	return new Promise((resolve, reject) => {
-		axios.delete(generateOcsUrl('apps/spreed/api/v1/room', 2) + token + '/participants/active')
-			.then(function() {
-				this._leaveRoomSuccess(token)
-				resolve()
-				// We left the current room.
-				if (token === this.currentRoomToken) {
-					this.currentRoomToken = null
-				}
-			}.bind(this))
-			.catch(function() {
-				reject(new Error())
+		.then(() => {
+			this._trigger('leaveRoom', [token])
+			this._doLeaveRoom(token)
+
+			return new Promise((resolve, reject) => {
+				axios.delete(generateOcsUrl('apps/spreed/api/v1/room', 2) + token + '/participants/active')
+					.then(function() {
+						this._leaveRoomSuccess(token)
+						resolve()
+						// We left the current room.
+						if (token === this.currentRoomToken) {
+							this.currentRoomToken = null
+						}
+					}.bind(this))
+					.catch(function() {
+						reject(new Error())
+					})
 			})
-	})
+		})
 }
 
 Signaling.Base.prototype.getSendVideoIfAvailable = function() {