Fix merge conflict between #2542 and #2543

PalmerAL · PalmerAL · commit d31bf0544f26 · 2025-01-04T11:45:59.000-06:00
diff --git a/main/main.js b/main/main.js
@@ -327,7 +327,7 @@ function createWindowWithBounds (bounds, customArgs) {
     }
   })
 
-  newWin.webContents.on('before-input-event', function(e, input) {
+  mainView.webContents.on('before-input-event', function(e, input) {
     sendIPCToWindow(newWin, 'before-input-event', input)
   })
 

Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ function createWindowWithBounds (bounds, customArgs) {`
`327`	`327`	`}`
`328`	`328`	`})`
`329`	`329`
`330`		`- newWin.webContents.on('before-input-event', function(e, input) {`
	`330`	`+ mainView.webContents.on('before-input-event', function(e, input) {`
`331`	`331`	`sendIPCToWindow(newWin, 'before-input-event', input)`
`332`	`332`	`})`
`333`	`333`