From 5c19a2cda9296fc632ee6e94d038f57f6df5cb43 Mon Sep 17 00:00:00 2001
From: yggverse <yggverse@project>
Date: Fri, 13 Sep 2024 03:15:42 +0300
Subject: [PATCH] fix memory index restore

---
 .../main/tab/page/navigation/history.cpp      | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/app/browser/main/tab/page/navigation/history.cpp b/src/app/browser/main/tab/page/navigation/history.cpp
index 138253ca..866c6370 100644
--- a/src/app/browser/main/tab/page/navigation/history.cpp
+++ b/src/app/browser/main/tab/page/navigation/history.cpp
@@ -67,7 +67,7 @@ int History::restore(
             R"SQL(
                 SELECT * FROM `app_browser_main_tab_page_navigation_history__session`
                         WHERE `app_browser_main_tab_page_navigation__session__id` = %d
-                        ORDER BY `id` DESC LIMIT 1
+                        ORDER BY `id` DESC
             )SQL",
             APP_BROWSER_MAIN_TAB_PAGE_NAVIGATION__SESSION__ID
         ).c_str(),
@@ -79,12 +79,15 @@ int History::restore(
 
     if (PREPARE_STATUS == SQLITE_OK)
     {
-        // Use latest record as order
+        // Reset current memory index
+        index = -1;
+
+        // Cleanup memory vector
+        memory.clear();
+
+        // Restore memory from database records
         while (sqlite3_step(statement) == SQLITE_ROW)
         {
-            // Cleanup
-            memory.clear();
-
             // Restore
             memory.push_back(
                 {
@@ -108,6 +111,12 @@ int History::restore(
 
             // Restore children components here (on available)
         }
+
+        // Navigate to latest memory index on current value still not found in database
+        if (index == -1)
+        {
+            index = memory.size() - 1;
+        }
     }
 
     return sqlite3_finalize(