Merge branch '1270-erreur-avec-multiples-instances-d-ivette' into 'stable/cobalt'

Resolve "Erreur avec multiples instances d'Ivette"

See merge request frama-c/frama-c!4228

ivette/src/dome/main/dome.ts

@@ -483,18 +483,15 @@ function createBrowserWindow(
     theWindow.off('close', closeHandler);
     // Do not close the window yet
     event.preventDefault();
-
+    // Save state
     handle.frame = theWindow.getBounds();
     handle.devtools = webContents.isDevToolsOpened();
-    webContents.send('dome.ipc.closing');
+    // Start closing process
+    webContents.send('dome.ipc.closing', wid);
   };
 
   theWindow.on('close', closeHandler);
 
-  ipcMain.on('dome.ipc.closing.done', () => {
-    theWindow.close();
-  });
-
   // Keep track of frame positions (in DEVEL)
   if (DEVEL) {
     const saveFrame = _.debounce(() => {
@@ -509,6 +506,11 @@ function createBrowserWindow(
   return theWindow;
 }
 
+ipcMain.on('dome.ipc.closing.done', (_event, wid:number) => {
+  const handle = WindowHandles.get(wid);
+  if (handle !== undefined) handle.window.close();
+});
+
 // --------------------------------------------------------------------------
 // --- Application Window(s) & Command Line
 // --------------------------------------------------------------------------

ivette/src/dome/renderer/dome.tsx

@@ -251,9 +251,9 @@ export const globalSettings = new Event(Settings.global);
 // --- Closing
 // --------------------------------------------------------------------------
 
-ipcRenderer.on('dome.ipc.closing', async () => {
+ipcRenderer.on('dome.ipc.closing', async (_event, wid: number) => {
     await System.doExit();
-    ipcRenderer.send('dome.ipc.closing.done');
+    ipcRenderer.send('dome.ipc.closing.done', wid);
   });
 
 /** Register a callback to be executed when the window is closing. */