Database: Fix FS#13368 – use separate selected item history

Database and File Browser were sharing
each other’s selected item history before.

Since the database isn’t browsed
recursively, it’s probably unnecessary to
include its own history in the tree context
and its backups, saving.a little bit of memory.

Change-Id: I87c9aed6f7056bc481b8b7299089851ef28f9bc5

1 files changed, 10 insertions, 6 deletions

diff --git a/apps/tagtree.c b/apps/tagtree.c
index b6d0c8ac06..19353cabbd 100644
--- a/apps/tagtree.c
+++ b/apps/tagtree.c
@@ -191,6 +191,10 @@ static int current_entry_count;
 
 static struct tree_context *tc;
 
+static int selected_item_history[MAX_DIR_LEVELS];
+static int table_history[MAX_DIR_LEVELS];
+static int extra_history[MAX_DIR_LEVELS];
+
 /* a few memory alloc helper */
 static int tagtree_handle;
 static size_t tagtree_bufsize, tagtree_buf_used;
@@ -1840,9 +1844,9 @@ int tagtree_enter(struct tree_context* c)
     if (c->dirlevel >= MAX_DIR_LEVELS)
         return 0;
 
-    c->selected_item_history[c->dirlevel]=c->selected_item;
-    c->table_history[c->dirlevel] = c->currtable;
-    c->extra_history[c->dirlevel] = c->currextra;
+    selected_item_history[c->dirlevel]=c->selected_item;
+    table_history[c->dirlevel] = c->currtable;
+    extra_history[c->dirlevel] = c->currextra;
     c->pos_history[c->dirlevel] = c->firstpos;
     c->dirlevel++;
 
@@ -1987,10 +1991,10 @@ void tagtree_exit(struct tree_context* c)
     c->dirfull = false;
     if (c->dirlevel > 0)
         c->dirlevel--;
-    c->selected_item=c->selected_item_history[c->dirlevel];
+    c->selected_item=selected_item_history[c->dirlevel];
     gui_synclist_select_item(&tree_lists, c->selected_item);
-    c->currtable = c->table_history[c->dirlevel];
-    c->currextra = c->extra_history[c->dirlevel];
+    c->currtable = table_history[c->dirlevel];
+    c->currextra = extra_history[c->dirlevel];
     c->firstpos  = c->pos_history[c->dirlevel];
 }