Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix javascript error on log out #2890

Merged
merged 1 commit into from
May 4, 2021

Conversation

sandymcfadden
Copy link
Contributor

Fix

Fixes #2888

When setting the Electron nativeTheme with the theme selected in the Simplenote settings it can cause a JavaScript error if the theme setting isn't present, such as when logging out of the app.

This checks to ensure the theme setting is set before updating the Electron nativeTheme setting.

Test

  1. Ensure you are logged in
  2. Log out.
  3. Ensure no error appears.

Release

NA

@sandymcfadden sandymcfadden added this to the 2.11.0 milestone May 4, 2021
@sandymcfadden sandymcfadden requested a review from a team May 4, 2021 10:32
@sandymcfadden sandymcfadden self-assigned this May 4, 2021
desktop/app.js Show resolved Hide resolved
@sandymcfadden sandymcfadden merged commit 97547db into release/2.11.0 May 4, 2021
@sandymcfadden sandymcfadden deleted the fix/logout-js-error-theme-setting branch May 4, 2021 15:38
@mokagio
Copy link
Contributor

mokagio commented May 4, 2021

This went into the release branch after beta1 shipped. Should we ship a new beta?

From the milestone list I can see there's nothing else open, so I'd say yes, but thought I'd check first. I'm asking because shipping a new beta involves a bit of manual labor still, so just trying to be efficient 😄

cc @pachlava

@sandymcfadden
Copy link
Contributor Author

Thanks @mokagio there is one more I'd like to get in. I hadn't updated the milestone yet but I have now #2889
I'd say once that fix goes in I can create the new beta.

@mokagio
Copy link
Contributor

mokagio commented May 6, 2021

👍 thanks @sandymcfadden

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants