mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

fix: free screen and window capturers immediately after we're finished with them (#20156)

Browse source 
fix #17937, #19908
This commit is contained in:
loc 2019-09-17 12:48:31 -04:00 • committed by Samuel Attard
parent 42999f42f2
commit d2a94e6b13
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/browser/desktop-capturer.ts
View file

@ -19,7 +19,13 @@ export const getSources = (event: Electron.IpcMainEvent, options: ElectronIntern
} }
const getSources = new Promise<ElectronInternal.GetSourcesResult[]>((resolve, reject) => { const getSources = new Promise<ElectronInternal.GetSourcesResult[]>((resolve, reject) => {
let capturer: ElectronInternal.DesktopCapturer | null = createDesktopCapturer()
const stopRunning = () => { const stopRunning = () => {
if (capturer) {
capturer.emit = null
capturer = null
}
// Remove from currentlyRunning once we resolve or reject // Remove from currentlyRunning once we resolve or reject
currentlyRunning = currentlyRunning.filter(running => running.options !== options) currentlyRunning = currentlyRunning.filter(running => running.options !== options)
} }
@ -42,19 +48,13 @@ export const getSources = (event: Electron.IpcMainEvent, options: ElectronIntern
}))) })))
}) })
let capturer: ElectronInternal.DesktopCapturer | null = createDesktopCapturer()
capturer.emit = emitter.emit.bind(emitter) capturer.emit = emitter.emit.bind(emitter)
capturer.startHandling(options.captureWindow, options.captureScreen, options.thumbnailSize, options.fetchWindowIcons) capturer.startHandling(options.captureWindow, options.captureScreen, options.thumbnailSize, options.fetchWindowIcons)
// If the WebContents is destroyed before receiving result, just remove the // If the WebContents is destroyed before receiving result, just remove the
// reference to emit and the capturer itself so that it never dispatches // reference to emit and the capturer itself so that it never dispatches
// back to the renderer // back to the renderer
event.sender.once('destroyed', () => { event.sender.once('destroyed', () => stopRunning())
capturer!.emit = null
capturer = null
stopRunning()
})
}) })
currentlyRunning.push({ currentlyRunning.push({

2
shell/browser/api/atom_api_desktop_capturer.cc
View file

@ -144,6 +144,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
} }
std::move(window_sources.begin(), window_sources.end(), std::move(window_sources.begin(), window_sources.end(),
std::back_inserter(captured_sources_)); std::back_inserter(captured_sources_));
window_capturer_.reset();
} }
if (capture_screen_ && if (capture_screen_ &&
@ -194,6 +195,7 @@ void DesktopCapturer::UpdateSourcesList(DesktopMediaList* list) {
// individual screen support is added. // individual screen support is added.
std::move(screen_sources.begin(), screen_sources.end(), std::move(screen_sources.begin(), screen_sources.end(),
std::back_inserter(captured_sources_)); std::back_inserter(captured_sources_));
screen_capturer_.reset();
} }
if (!capture_window_ && !capture_screen_) if (!capture_window_ && !capture_screen_)