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

Check whether sender is destroyed before calling sender.send

Browse source 
Fix #4279.
This commit is contained in:
Cheng Zhao 2016-01-30 12:58:21 +08:00
parent 5d16257c2d
commit 3f68b2f227
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/lib/rpc-server.js
View file

@ -162,12 +162,12 @@ var unwrapArgs = function(sender, args) {
}); });
let callIntoRenderer = function(...args) { let callIntoRenderer = function(...args) {
if (rendererReleased) if (rendererReleased || sender.isDestroyed())
throw new Error(`Attempting to call a function in a renderer window that has been closed or released. Function provided here: ${meta.location}.`); throw new Error(`Attempting to call a function in a renderer window that has been closed or released. Function provided here: ${meta.location}.`);
sender.send('ATOM_RENDERER_CALLBACK', meta.id, valueToMeta(sender, args)); sender.send('ATOM_RENDERER_CALLBACK', meta.id, valueToMeta(sender, args));
}; };
v8Util.setDestructor(callIntoRenderer, function() { v8Util.setDestructor(callIntoRenderer, function() {
if (!rendererReleased) if (!rendererReleased && !sender.isDestroyed())
sender.send('ATOM_RENDERER_RELEASE_CALLBACK', meta.id); sender.send('ATOM_RENDERER_RELEASE_CALLBACK', meta.id);
}); });
sender.callbacks.set(meta.id, callIntoRenderer); sender.callbacks.set(meta.id, callIntoRenderer);