Merge pull request #1654 from SimonBrandner/terminate-screen-share

Properly terminate screen-share calls if NoUserMedia
matrix-org · Apr 5, 2021 · 59e0bd4 · 59e0bd4
2 parents 3820c15 + 02b283b
commit 59e0bd4
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/webrtc/call.ts b/src/webrtc/call.ts
@@ -381,7 +381,11 @@ export class MatrixCall extends EventEmitter {
 
         try {
             const screenshareConstraints = await getScreenshareContraints(selectDesktopCapturerSource);
-            if (!screenshareConstraints) return;
+            if (!screenshareConstraints) {
+                this.terminate(CallParty.Local, CallErrorCode.NoUserMedia, false);
+                return;
+            }
+
             if (window.electron?.getDesktopCapturerSources) {
                 // We are using Electron
                 logger.debug("Getting screen stream using getUserMedia()...");
@@ -402,6 +406,7 @@ export class MatrixCall extends EventEmitter {
                     "Failed to get screen-sharing stream: ", err,
                 ),
             );
+            this.terminate(CallParty.Local, CallErrorCode.NoUserMedia, false);
         }
         this.type = CallType.Video;
     }