github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-04-10 03:01:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing remote object error when calling remote function created in preload script (#15444)

Browse Source 
* fix: report wrong context error based on contextId

* fix: destroyed remote renderer warning is now async
This commit is contained in:
Cheng Zhao
2018-11-01 00:26:57 +09:00
committed by John Kleinschmidt
parent b2e1a93177
commit a8f2646ba6
5 changed files with 54 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/renderer/api/remote.js
View File

@@ -270,9 +270,12 @@ function metaToPlainObject (meta) {
}
function handleMessage (channel, handler) {
ipcRenderer.on(channel, (event, passedContextId, ...args) => {
ipcRenderer.on(channel, (event, passedContextId, id, ...args) => {
if (passedContextId === contextId) {
handler(...args)
handler(id, ...args)
} else {
// Message sent to an un-exist context, notify the error to main process.
ipcRenderer.send('ELECTRON_BROWSER_WRONG_CONTEXT_ERROR', contextId, passedContextId, id)
}
})
}