Prevent AoT and SS-tracker windows from being captured

In electron utils 2.0.15 we mark them as protected content, but on macOS
WebRTC uses a low level API which sidesteps that. An extra command line
argument is passed to fix that.

See: https://github.com/electron/electron/issues/19880
This commit is contained in:
Saúl Ibarra Corretgé 2021-03-05 16:27:28 +01:00
parent bad37a6d5e
commit da42179d3b
3 changed files with 7 additions and 3 deletions

View file

@ -29,6 +29,10 @@ const showDevTools = Boolean(process.env.SHOW_DEV_TOOLS) || (process.argv.indexO
// We need this because of https://github.com/electron/electron/issues/18214
app.commandLine.appendSwitch('disable-site-isolation-trials');
// This allows BrowserWindow.setContentProtection(true) to work on macOS.
// https://github.com/electron/electron/issues/19880
app.commandLine.appendSwitch('disable-features', 'IOSurfaceCapturer');
// Needed until robot.js is fixed: https://github.com/octalmage/robotjs/issues/580
app.allowRendererProcessReuse = false;

4
package-lock.json generated
View file

@ -10181,8 +10181,8 @@
}
},
"jitsi-meet-electron-utils": {
"version": "github:jitsi/jitsi-meet-electron-utils#3057c0864cdfbe46353e9a1d512b5ef3bad126f2",
"from": "github:jitsi/jitsi-meet-electron-utils#v2.0.14",
"version": "github:jitsi/jitsi-meet-electron-utils#8b28efb086b8d185e5ea5563d21607c47bc8cc9b",
"from": "github:jitsi/jitsi-meet-electron-utils#v2.0.15",
"requires": {
"jitsi-meet-logger": "github:jitsi/jitsi-meet-logger#v1.0.0",
"mac-screen-capture-permissions": "^1.1.0",

View file

@ -116,7 +116,7 @@
"electron-window-state": "5.0.3",
"history": "4.10.1",
"i18next": "19.4.5",
"jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v2.0.14",
"jitsi-meet-electron-utils": "github:jitsi/jitsi-meet-electron-utils#v2.0.15",
"moment": "2.23.0",
"mousetrap": "1.6.2",
"react": "16.8.0",