Skip to content

Commit

Permalink
SDA-4587 - Bump electron version (#2164)
Browse files Browse the repository at this point in the history
* SDA-4587 - Add safety check for main view

* SDA-4587 - Upgrade electron version to 30.1.0
  • Loading branch information
KiranNiranjan authored Jun 17, 2024
1 parent a6a72e7 commit eb5b0a4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 12 deletions.
18 changes: 9 additions & 9 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
"builder-util-runtime": "^9.0.3",
"cross-env": "7.0.3",
"del": "3.0.0",
"electron": "30.0.9",
"electron": "30.1.0",
"electron-builder": "^24.13.2",
"electron-devtools-installer": "^3.2.0",
"electron-icon-maker": "0.0.5",
Expand Down
4 changes: 2 additions & 2 deletions src/app/window-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ export class WindowHandler {
// Event needed to hide native menu bar on Windows 10 as we use custom menu bar
this.mainWebContents.once('did-start-loading', () => {
logger.info(
`window-handler: main window web contents started loading for url ${this.mainView?.webContents.getURL()}!`,
`window-handler: main window web contents started loading for url ${this.mainView?.webContents?.getURL()}!`,
);
this.finishedLoading = false;
this.listenForLoad();
Expand Down Expand Up @@ -652,7 +652,7 @@ export class WindowHandler {
// workaround for https://perzoinc.atlassian.net/browse/SDA-4251
this.mainWindow?.on('focus', () => {
const mainView = this.getMainView();
mainView?.webContents.focus();
mainView?.webContents?.focus();
if (
this.mainWindow &&
windowExists(this.mainWindow) &&
Expand Down

0 comments on commit eb5b0a4

Please sign in to comment.