fix crash on disconnect button (#692)

planetdecred · May 27, 2020 · aaff2e1 · aaff2e1
1 parent 73591e2
commit aaff2e1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 7 deletions.
diff --git a/Decred Wallet/Features/Overview/OverviewViewController.swift b/Decred Wallet/Features/Overview/OverviewViewController.swift
@@ -350,14 +350,19 @@ class OverviewViewController: UIViewController {
     // Handle action of rescan, sync connect/reconnect/cancel button click based on sync/network status
     @IBAction func syncConnectionButtonTap(_ sender: Any) {
         if SyncManager.shared.isRescanning {
-            WalletLoader.shared.multiWallet.cancelRescan()
+            DispatchQueue.global(qos: .userInitiated).async {
+                WalletLoader.shared.multiWallet.cancelRescan()
+            }
         } else if SyncManager.shared.isSynced || SyncManager.shared.isSyncing {
-            WalletLoader.shared.multiWallet.cancelSync()
+             DispatchQueue.global(qos: .userInitiated).async {
+                WalletLoader.shared.multiWallet.cancelSync()
+            }
         } else {
             SyncManager.shared.startSync(allowSyncOnCellular: Settings.syncOnCellular)
         }
-
-        self.updateSyncConnectionButtonTextAndIcon()
+        DispatchQueue.main.async {
+            self.updateSyncConnectionButtonTextAndIcon()
+        }
     }
 
     @IBAction func showOrHideSyncDetails(_ sender: Any) {

diff --git a/Decred Wallet/Features/Wallets/WalletSettingsViewController.swift b/Decred Wallet/Features/Wallets/WalletSettingsViewController.swift
@@ -162,9 +162,13 @@ class WalletSettingsViewController: UIViewController {
 
         if WalletLoader.shared.multiWallet.openedWalletsCount() == 0 {
             Settings.clear()
-            WalletLoader.shared.multiWallet.shutdown()
-            let startScreen = Storyboard.Main.initialViewController()
-            AppDelegate.shared.setAndDisplayRootViewController(startScreen!)
+            DispatchQueue.global(qos: .userInitiated).async {
+                WalletLoader.shared.multiWallet.shutdown()
+                DispatchQueue.main.async {
+                    let startScreen = Storyboard.Main.initialViewController()
+                    AppDelegate.shared.setAndDisplayRootViewController(startScreen!)
+                }
+            }
         } else {
             self.dismissView()
         }