From 04eaa1c3fdbd246c4fbaf6669518b3805e674345 Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Tue, 1 Oct 2024 15:35:54 +0300
Subject: [PATCH] fix navigation index offset

---
 src/browser/main/tab/page/navigation/history.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/browser/main/tab/page/navigation/history.rs b/src/browser/main/tab/page/navigation/history.rs
index 4ea2e02c..6ba44aff 100644
--- a/src/browser/main/tab/page/navigation/history.rs
+++ b/src/browser/main/tab/page/navigation/history.rs
@@ -66,13 +66,18 @@ impl History {
     pub fn add(&self, request: GString, follow_to_index: bool) {
         // Append new Memory record
         self.memory.borrow_mut().push(Memory {
-            request,
+            request: request.clone(),
             //time: SystemTime::now(),
         });
 
         if follow_to_index {
-            // Navigate to the last record appended
-            self.index.replace(Some(self.memory.borrow().len()));
+            // Even push action make positive len value, make sure twice
+            if !self.memory.borrow().is_empty() {
+                // Navigate to the last record appended
+                self.index.replace(Some(self.memory.borrow().len() - 1));
+            } else {
+                self.index.replace(None);
+            }
         }
     }