Fix: 1:1 call - screen sharing no longer works after pressing the cancel button in Element-Desktop

[gumara-dev]

Fixes element-hq/element-desktop#1367

Signed-off-by: Stephan Raab [email protected]

Checklist

• Tests written for new code (and old code if feasible).
• New or updated public/exported symbols have accurate TSDoc documentation.
• Linter and other CI checks pass.
• Sign-off given on the changes (see CONTRIBUTING.md).

[t3chguy]

This needs a comment as it is non-obvious, as well as sign-off as per the checklist

Sign-off given on the changes (see CONTRIBUTING.md).

[gumara-dev]

This needs a comment as it is non-obvious, as well as sign-off as per the checklist

Sign-off given on the changes (see CONTRIBUTING.md).

Signed-off-by: Stephan Raab [email protected]

[robintown]

Hi, thanks for the contribution! It's not apparent to me how this fix works. Could you add a comment explaining why we need to always call the callback?

[gumara-dev]

Hi, thanks for the contribution! It's not apparent to me how this fix works. Could you add a comment explaining why we need to always call the callback?

@robintown

However, the await function that was called by the matrix-js-sdk call.ts on line 1274

const stream = await this.client.getMediaHandler().getScreensharingStream(opts);

never returns. This only happens when a stream is selected.
If this return is now commented out and the this.ipc.call("callDisplayMediaCallback", source); is also executed on cancel, it works.

[robintown]

Okay, so in other words the getDisplayMedia promise will never resolve if we don't at least provide a dummy value? That's the kind of thing that should go in a comment in the code.

[gumara-dev]

Okay, so in other words the getDisplayMedia promise will never resolve if we don't at least provide a dummy value? That's the kind of thing that should go in a comment in the code.

That’s correct 👌🏻

Resolved

[gumara-dev]

@robintown Thanks :)