Skip to content
This repository was archived by the owner on Dec 15, 2022. It is now read-only.

Commit 4911998

Browse files
author
steven nguyen
authored
Use addEventListener
I have no idea why this error exists, but at least this is a change since I use `removeEventListener` too.
1 parent 2053290 commit 4911998

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

lib/worker.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,28 @@ const operationCountLimit = parseInt(query.operationCountLimit, 10);
4444
const averageTracker = new AverageTracker({limit: operationCountLimit});
4545
const childPidsById = new Map();
4646

47+
const cleanUp = () => {
48+
managerWebContents.removeListener('crashed', destroyRenderer);
49+
managerWebContents.removeListener('destroyed', destroyRenderer);
50+
window.removeEventListener('beforeunload', cleanUp)
51+
};
52+
4753
const destroyRenderer = () => {
4854
if (!managerWebContents.isDestroyed()) {
49-
managerWebContents.removeListener('crashed', destroyRenderer);
50-
managerWebContents.removeListener('destroyed', destroyRenderer);
55+
cleanUp()
5156
}
5257
const win = remote.BrowserWindow.fromWebContents(remote.getCurrentWebContents());
5358
if (win && !win.isDestroyed()) {
5459
win.destroy();
5560
}
5661
};
62+
5763
const managerWebContentsId = parseInt(query.managerWebContentsId, 10);
5864
const managerWebContents = remote.webContents.fromId(managerWebContentsId);
5965
if (managerWebContents && !managerWebContents.isDestroyed()) {
6066
managerWebContents.on('crashed', destroyRenderer);
6167
managerWebContents.on('destroyed', destroyRenderer);
62-
window.onbeforeunload = () => {
63-
managerWebContents.removeListener('crashed', destroyRenderer);
64-
managerWebContents.removeListener('destroyed', destroyRenderer);
65-
};
68+
window.addEventListener('beforeunload', cleanup);
6669
}
6770

6871
const channelName = query.channelName;

0 commit comments

Comments
 (0)