Fix crash when quickly adding/removing tabs in switcher

duckduckgo · Apr 17, 2024 · 2d82935 · 2d82935
1 parent bcc849a
commit 2d82935
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/DuckDuckGo/TabSwitcherViewController+KeyCommands.swift b/DuckDuckGo/TabSwitcherViewController+KeyCommands.swift
@@ -54,6 +54,7 @@ extension TabSwitcherViewController {
     }
 
     @objc func keyboardNewTab() {
+        guard !isProcessingUpdates else { return }
         delegate?.tabSwitcherDidRequestNewTab(tabSwitcher: self)
         dismiss()
     }

diff --git a/DuckDuckGo/TabSwitcherViewController.swift b/DuckDuckGo/TabSwitcherViewController.swift
@@ -71,7 +71,7 @@ class TabSwitcherViewController: UIViewController {
     var currentSelection: Int?
 
     private var tabSwitcherSettings: TabSwitcherSettings = DefaultTabSwitcherSettings()
-    private var isProcessingUpdates = false
+    private(set) var isProcessingUpdates = false
     private var canUpdateCollection = true
 
     let favicons = Favicons.shared
@@ -278,6 +278,7 @@ class TabSwitcherViewController: UIViewController {
     }
 
     @IBAction func onAddPressed(_ sender: UIBarButtonItem) {
+        guard !isProcessingUpdates else { return }
         delegate.tabSwitcherDidRequestNewTab(tabSwitcher: self)
         dismiss()
     }

diff --git a/DuckDuckGo/TabViewCell.swift b/DuckDuckGo/TabViewCell.swift
@@ -123,12 +123,12 @@ class TabViewCell: UICollectionViewCell {
     }
 
     private func startRemoveAnimation() {
+        self.isDeleting = true
+        self.deleteTab()
         UIView.animate(withDuration: 0.2, animations: {
             self.transform = CGAffineTransform.identity.translatedBy(x: -self.frame.width, y: 0)
         }, completion: { _ in
             self.isHidden = true
-            self.isDeleting = true
-            self.deleteTab()
         })
     }