Merge commit 'bed5346e508e51a0df717c8a05b1de6d41c41ec8' into release

jgraph · Jul 21, 2023 · 0a44fe0 · 0a44fe0 · davidjgraph · Jul 22, 2023
2 parents 3b389f7 + bed5346
commit 0a44fe0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/package.json b/package.json
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@electron/notarize": "^2.1.0",
     "dotenv": "^16.3.1",
-    "electron": "^25.3.0",
+    "electron": "^25.3.1",
     "electron-builder": "^24.5.2",
     "sumchecker": "^3.0.1"
   }

diff --git a/src/main/electron.js b/src/main/electron.js
@@ -179,11 +179,11 @@ function createWindow (opt = {})
 
 	mainWindow.on('close', (event) =>
 	{
-		const win = event.sender
-		const index = windowsRegistry.indexOf(win)
+		const win = mainWindow;
 
-		if (__DEV__) 
+		if (__DEV__)
 		{
+			const index = windowsRegistry.indexOf(win)
 			console.log('Window on close', index)
 		}
 
@@ -244,9 +244,9 @@ function createWindow (opt = {})
 	})
 
 	// Emitted when the window is closed.
-	mainWindow.on('closed', (event/*:WindowEvent*/) =>
+	mainWindow.on('closed', () =>
 	{
-		const index = windowsRegistry.indexOf(event.sender)
+		const index = windowsRegistry.indexOf(mainWindow)
 
 		if (__DEV__) 
 		{

diff --git a/yarn.lock b/yarn.lock
@@ -805,7 +805,7 @@ electron-updater@^6.1.1:
     semver "^7.3.8"
     typed-emitter "^2.1.0"
 
-electron@^25.3.0:
+electron@^25.3.1:
   version "25.3.1"
   resolved "https://registry.yarnpkg.com/electron/-/electron-25.3.1.tgz#898cbb5e54d17ad0014123a10f5febc17638c6a9"
   integrity sha512-t0QXXqgf0/P0OJ9LU3qpcBMK+wL0FRwTQfooBaaG08v5hywPzc1yplfb3l4tS1xC0Ttw8IBaKLBeEoRgxBRHjg==