fix: memory leak: Added listener to webContents without cleaning up p…

…revious listener
nrkno · Jan 8, 2024 · 6b5ac10 · 6b5ac10
1 parent c741018
commit 6b5ac10
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/src/helpers/WindowHelper.ts b/src/helpers/WindowHelper.ts
@@ -210,19 +210,11 @@ export class WindowHelper extends EventEmitter {
 				await this.window.webContents.insertCSS(`html, body { background-color: ${defaultColor}; }`)
 			}
 
+			this.setupWebContentListeners()
+
 			this.window.setTitle(this.title)
-			this.window.webContents.on('render-process-gone', (event, details) => {
-				if (details.reason !== 'clean-exit') {
-					this.status = {
-						statusCode: StatusCode.ERROR,
-						message: `Renderer process gone "${this._url}": ${details.reason}, ${details.exitCode}, "${event}"`,
-					}
-				}
-			})
 			this.window.webContents.setZoomFactor((this.config.zoomFactor ?? 100) / 100)
 
-			await this.listenToContentStatuses()
-
 			if (this.config.displayDebug) {
 				await this.displayDebugOverlay()
 			}
@@ -303,6 +295,14 @@ export class WindowHelper extends EventEmitter {
 			return windowUrl
 		}
 	}
+	private handleRenderProcessGone = (event: Electron.Event, details: Electron.RenderProcessGoneDetails): void => {
+		if (details.reason !== 'clean-exit') {
+			this.status = {
+				statusCode: StatusCode.ERROR,
+				message: `Renderer process gone "${this._url}": ${details.reason}, ${details.exitCode}, "${event}"`,
+			}
+		}
+	}
 	private handleConsoleMessage = (
 		_event: Electron.Event,
 		level: number,
@@ -316,7 +316,10 @@ export class WindowHelper extends EventEmitter {
 		}
 	}
 
-	private async listenToContentStatuses() {
+	private setupWebContentListeners() {
+		this.window.webContents.off('render-process-gone', this.handleRenderProcessGone)
+		this.window.webContents.on('render-process-gone', this.handleRenderProcessGone)
+
 		this.window.webContents.off('console-message', this.handleConsoleMessage)
 		this.window.webContents.on('console-message', this.handleConsoleMessage)
 	}