Use defer to nil out the previous visit.

hotwired · Mar 4, 2024 · 54b1cd8 · 54b1cd8
1 parent ef3b9fa
commit 54b1cd8
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/Source/Session/Session.swift b/Source/Session/Session.swift
@@ -214,8 +214,9 @@ extension Session: VisitDelegate {
 
 extension Session: VisitableDelegate {
     public func visitableViewWillAppear(_ visitable: Visitable) {
-        let lastDisappearingVisit = self.previosVisit
-        self.previosVisit = nil
+        defer {
+            previosVisit = nil
+        }
 
         guard let topmostVisit = self.topmostVisit, let currentVisit = self.currentVisit else { return }
 
@@ -229,8 +230,11 @@ extension Session: VisitableDelegate {
         } else if visitable === currentVisit.visitable && currentVisit.state == .started {
             // Navigating forward - complete navigation early
             completeNavigationForCurrentVisit()
-        } else if visitable !== topmostVisit.visitable || visitable === previosVisit?.visitable {
-            // Navigating backward
+        } else if visitable !== topmostVisit.visitable {
+            // Navigating backward from a web view screen to a web view screen.
+            visit(visitable, action: .restore)
+        } else if visitable === previosVisit?.visitable {
+            // Navigating backward from a native to a web view screen.
             visit(visitable, action: .restore)
         }
     }