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.

Sign up for GitHub

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

Jump to bottom

Fix #6879: reconfig will crash if FxA init is in-progress #6880

Merged
merged 1 commit into from Jun 30, 2020
Merged

Fix #6879: reconfig will crash if FxA init is in-progress #6880

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions RustFxA/RustFirefoxAccounts.swift
View file
Open in desktop
Expand Up @@ -102,6 +102,10 @@ open class RustFirefoxAccounts {

@discardableResult
public static func reconfig(prefs: Prefs) -> Deferred<FxAccountManager> {
if isInitializingAccountManager {
// This func is for reconfiguring a completed FxA init, if FxA init is in-progress, let it complete the init as-is
return shared.accountManager
}
isInitializingAccountManager = false
shared.accountManager = Deferred<FxAccountManager>()
return startup(prefs: prefs)
Expand Down