Merge branch 'develop' into feed

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
commit 551e8ecb8d
No known key found for this signature in database
GPG key ID: 9760693FDD98A790
105 changed files with 3957 additions and 1723 deletions

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);
}