Merge pull request #27301 from gumara-dev/fix_branch

Fix: 1:1 call - screen sharing no longer works after pressing the cancel button in Element-Desktop
element-hq · Apr 9, 2024 · 8ce46d3 · 8ce46d3
2 parents f64759e + 2cad731
commit 8ce46d3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/vector/platform/ElectronPlatform.tsx b/src/vector/platform/ElectronPlatform.tsx
@@ -170,8 +170,8 @@ export default class ElectronPlatform extends VectorBasePlatform {
         window.electron.on("openDesktopCapturerSourcePicker", () => {
             const { finished } = Modal.createDialog(DesktopCapturerSourcePicker);
             finished.then(([source]) => {
-                if (!source) return;
-                this.ipc.call("callDisplayMediaCallback", source);
+                // getDisplayMedia promise does not return if no dummy is passed here as source
+                this.ipc.call("callDisplayMediaCallback", source ?? { id: "", name: "", thumbnailURL: "" });
             });
         });