From acd48a6db49cc00c1611d8dc4d03e49658084f5a Mon Sep 17 00:00:00 2001 From: Shadowfacts Date: Mon, 2 Jan 2023 11:41:40 -0500 Subject: [PATCH] When logging out, remove the scene's active account rather than the most-recently activated one, as they may not be the same --- Tusker/Scenes/MainSceneDelegate.swift | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Tusker/Scenes/MainSceneDelegate.swift b/Tusker/Scenes/MainSceneDelegate.swift index 8d0a38a0..e7fcf866 100644 --- a/Tusker/Scenes/MainSceneDelegate.swift +++ b/Tusker/Scenes/MainSceneDelegate.swift @@ -211,7 +211,10 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate } func logoutCurrent() { - LocalData.shared.removeAccount(LocalData.shared.getMostRecentAccount()!) + guard let account = window?.windowScene?.session.mastodonController?.accountInfo else { + return + } + LocalData.shared.removeAccount(account) if LocalData.shared.onboardingComplete { activateAccount(LocalData.shared.accounts.first!, animated: false) } else {