add NO-OP to use track methods and fix crash

in _setLocalAudioVideoStreams on not a promise
jitsi · Sep 10, 2021 · 9683c2b · 9683c2b
1 parent 532fbd3
commit 9683c2b
Showing 1 changed file with 16 additions and 2 deletions.
diff --git a/conference.js b/conference.js
@@ -1335,7 +1335,7 @@ export default {
      * @private
      */
     _setLocalAudioVideoStreams(tracks = []) {
-        const promise = tracks.map(track => {
+        const promises = tracks.map(track => {
             if (track.isAudioTrack()) {
                 return this.useAudioStream(track);
             } else if (track.isVideoTrack()) {
@@ -1350,7 +1350,7 @@ export default {
 
         });
 
-        return promise.then(() => {
+        return Promise.all(promises).then(() => {
             this._localTracksInitialized = true;
             logger.log(`Initialized with ${tracks.length} local tracks`);
         });
@@ -1379,6 +1379,13 @@ export default {
 
                 logger.debug(`useVideoStream: Replacing ${oldTrack} with ${newTrack}`);
 
+                if (oldTrack === newTrack) {
+                    resolve();
+                    onFinish();
+
+                    return;
+                }
+
                 APP.store.dispatch(
                     replaceLocalTrack(oldTrack, newTrack, room))
                     .then(() => {
@@ -1433,6 +1440,13 @@ export default {
             _replaceLocalAudioTrackQueue.enqueue(onFinish => {
                 const oldTrack = getLocalJitsiAudioTrack(APP.store.getState());
 
+                if (oldTrack === newTrack) {
+                    resolve();
+                    onFinish();
+
+                    return;
+                }
+
                 APP.store.dispatch(
                 replaceLocalTrack(oldTrack, newTrack, room))
                     .then(() => {