fix(electron): Check whether the splash screen is already destroyed on close #2044
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Resolves ionic-team#2010 on MacOS. The issue stems from the splash screen being destroyed already, so I'm simply adding a check to ensure that the splash screen reference has a value and that it isn't already destroyed. This seems to solve the problem in a straightforward manner.
electron/index.js
Outdated
| @@ -113,7 +113,9 @@ class CapacitorSplashScreen { | |||
| `; | |||
|
|
|||
| this.mainWindowRef.on('closed', () => { | |||
| this.splashWindow.close(); | |||
| if (this.splashWindow && !this.splashWindow.isDestroyed) { | |||
There was a problem hiding this comment.
isDestroyed is a function, not a property. This condition will always return false.
There was a problem hiding this comment.
Fixed with latest commit. Thanks, @benjcallaghan!
Responding to the code review, fixed the call to `isDestroyed()` instead of `isDestroyed`.
jcesarmobile
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves #2010 on MacOS.
The issue stems from the splash screen being destroyed already, so I'm simply adding a check to ensure that the splash screen reference has a value and that it isn't already destroyed. This seems to solve the problem in a straightforward manner.