diff options
| author | Saúl Ibarra Corretgé <s@saghul.net> | 2021-03-05 16:27:28 +0100 |
|---|---|---|
| committer | Saúl Ibarra Corretgé <s@saghul.net> | 2021-03-05 23:13:17 +0100 |
| commit | da42179d3b7048c69b2b165527a08a9fa7e3828c (patch) | |
| tree | f773c16ca9f29dcf62c2148949b8c0d42f5fa070 | |
| parent | bad37a6d5e4c655dac26c63c0be7e04e45e76c8b (diff) | |
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
| -rw-r--r-- | main.js | 4 | ||||
| -rw-r--r-- | package-lock.json | 4 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -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; diff --git a/package-lock.json b/package-lock.json index 1ac5bbd..72f6fe8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -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", diff --git a/package.json b/package.json index cb7b072..f34f758 100644 --- a/package.json +++ b/package.json @@ -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", |