matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-05 23:10:41 +03:00
Code Activity

Merge branch 'develop' into feed

Browse Source 
Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2021-04-28 10:52:23 +02:00
parent 9a16fcb6fc afd53d8b53
commit 551e8ecb8d
105 changed files with 3957 additions and 1723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/CallHandler.tsx
View File

@@ -651,11 +651,12 @@ export default class CallHandler extends EventEmitter {
}
call.placeScreenSharingCall(
async () : Promise<DesktopCapturerSource> => {
async (): Promise<DesktopCapturerSource> => {
const {finished} = Modal.createDialog(DesktopCapturerSourcePicker);
const [source] = await finished;
return source;
});
},
);
} else {
console.error("Unknown conf call type: " + type);
}