devproje/project-client
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

more fixing

Browse source
This commit is contained in:
Kaitlyn 2023-09-28 14:15:40 -04:00
parent f1cacc5720
commit c2e3722c3a
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/screenShare.ts
View file

@ -31,11 +31,9 @@ export function registerScreenShareHandler() {
height: 99 height: 99
} }
}).catch(() => null); }).catch(() => null);
if (sources === null) return callback({}); if (sources === null) return callback({});
<<<<<<< HEAD
=======
>>>>>>> 2e5c450b14553561ad6ca505152d2a93766ca138
const isWayland = const isWayland =
process.platform === "linux" && process.platform === "linux" &&
(process.env.XDG_SESSION_TYPE === "wayland" || !!process.env.WAYLAND_DISPLAY); (process.env.XDG_SESSION_TYPE === "wayland" || !!process.env.WAYLAND_DISPLAY);
@ -48,17 +46,12 @@ export function registerScreenShareHandler() {
if (isWayland) { if (isWayland) {
const video = data[0]; const video = data[0];
<<<<<<< HEAD
getAudioFromVirtmic();
callback(video ? { video } : {});
=======
if (video) if (video)
await request.frame.executeJavaScript( await request.frame.executeJavaScript(
`Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify([video])}, true)` `Vesktop.Components.ScreenShare.openScreenSharePicker(${JSON.stringify([video])}, true)`
); );
callback(video ? { video: sources[0] } : {}); callback(video ? { video: sources[0] } : {});
>>>>>>> 2e5c450b14553561ad6ca505152d2a93766ca138
return; return;
} }