From f3a2bd6b40fe26b8cc3797fd78e4dd23a2c6f346 Mon Sep 17 00:00:00 2001 From: Robert Long Date: Wed, 15 Sep 2021 12:38:12 -0700 Subject: [PATCH] Clean up stopAllMedia --- src/webrtc/call.ts | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/webrtc/call.ts b/src/webrtc/call.ts index 5705c9bb4..f1af549ca 100644 --- a/src/webrtc/call.ts +++ b/src/webrtc/call.ts @@ -1747,19 +1747,15 @@ export class MatrixCall extends EventEmitter { logger.debug(`stopAllMedia (stream=${this.localUsermediaStream})`); for (const feed of this.feeds) { - if (feed.isLocal()) { - if (feed.purpose === SDPStreamMetadataPurpose.Usermedia) { - this.client.getMediaHandler().stopUserMediaStream(feed.stream); - continue; - } else if (feed.purpose === SDPStreamMetadataPurpose.Screenshare) { - this.client.getMediaHandler().stopScreensharingStream(feed.stream); - continue; + if (feed.isLocal() && feed.purpose === SDPStreamMetadataPurpose.Usermedia) { + this.client.getMediaHandler().stopUserMediaStream(feed.stream); + } else if (feed.isLocal() && feed.purpose === SDPStreamMetadataPurpose.Screenshare) { + this.client.getMediaHandler().stopScreensharingStream(feed.stream); + } else { + for (const track of feed.stream.getTracks()) { + track.stop(); } } - - for (const track of feed.stream.getTracks()) { - track.stop(); - } } }