Merge pull request #5 from nkolba/fix-doubles-after-reactivate

better cleanup runtime objects and listeners so that we don't get dou…
finos · Mar 30, 2022 · b8222c5 · b8222c5
2 parents 0fcff33 + 681dad7
commit b8222c5
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/packages/main/src/index.ts b/packages/main/src/index.ts
@@ -77,6 +77,10 @@ app.disableHardwareAcceleration();
  */
 app.on('window-all-closed', () => {
   if (process.platform !== 'darwin') {
+    if (runtime) {
+      runtime.clean();
+      runtime = null;
+    }
     app.quit();
   }
 });
@@ -85,6 +89,11 @@ app.on('window-all-closed', () => {
  * @see https://www.electronjs.org/docs/v14-x-y/api/app#event-activate-macos Event: 'activate'
  */
 app.on('activate', () => {
+  console.log('activated');
+  if (runtime) {
+    runtime.clean();
+    runtime = null;
+  }
   runtime = new Runtime();
   createWindow();
 });

diff --git a/packages/main/src/listeners/listener.ts b/packages/main/src/listeners/listener.ts
@@ -43,6 +43,8 @@ export class RuntimeListener {
 
   constructor(runtime: Runtime) {
     this.runtime = runtime;
+    //start with clean IPC
+    ipcMain.removeAllListeners();
 
     ipcMain.on(TOPICS.SELECT_TAB, (event, args) => {
       //bring selected browserview to front

diff --git a/packages/main/src/runtime.ts b/packages/main/src/runtime.ts
@@ -270,4 +270,12 @@ export class Runtime {
   dropResolver() {
     resolver = undefined;
   }
+
+  //cleanup state of the runtime
+  clean() {
+    contexts.clear();
+    views.clear();
+    workspaces.clear();
+    resolver = undefined;
+  }
 }