From ad307d406f3e5bd55a10c683dbed896a5d80b774 Mon Sep 17 00:00:00 2001 From: Kiran Niranjan Date: Tue, 7 Nov 2017 20:05:33 +0530 Subject: [PATCH] Electron-197 - Added a check to only return screen sources if desktop composition is disabled on Windows --- js/desktopCapturer/getSources.js | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/js/desktopCapturer/getSources.js b/js/desktopCapturer/getSources.js index a52edbdb..fe797422 100644 --- a/js/desktopCapturer/getSources.js +++ b/js/desktopCapturer/getSources.js @@ -12,7 +12,8 @@ // renderer process, this will have to do. See github issue posted here to // electron: https://github.com/electron/electron/issues/9312 -const { ipcRenderer } = require('electron'); +const { ipcRenderer, remote } = require('electron'); +const { isMac } = require('../utils/misc'); let nextId = 0; let includes = [].includes; @@ -52,6 +53,17 @@ function getSources(options, callback) { }; } + if (!isMac) { + /** + * Sets the captureWindow to false if Desktop composition + * is disabled otherwise true + * + * Setting captureWindow to false returns only screen sources + * @type {boolean} + */ + captureWindow = remote.systemPreferences.isAeroGlassEnabled(); + } + id = getNextId(); ipcRenderer.send('ELECTRON_BROWSER_DESKTOP_CAPTURER_GET_SOURCES', captureWindow, captureScreen, updatedOptions.thumbnailSize, id);