summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Bavin <pondlife@pondlife.me>2007-03-08 10:16:43 +0000
committerSteve Bavin <pondlife@pondlife.me>2007-03-08 10:16:43 +0000
commit993f5896f64ef2beafe069c6e3c6919f99829f25 (patch)
treed65746eb15d860e92c7aba54255ffac799bf0a51
parent9be03e14cc6385c43255e6b99c9e8046248a42a1 (diff)
downloadrockbox-993f5896f64ef2beafe069c6e3c6919f99829f25.tar.gz
rockbox-993f5896f64ef2beafe069c6e3c6919f99829f25.zip
Temporarily revert the database auto-init as it causes navigation problems that I don't have time to fix yet
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12686 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/root_menu.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/apps/root_menu.c b/apps/root_menu.c
index b9847dfd54..3b301e6d3a 100644
--- a/apps/root_menu.c
+++ b/apps/root_menu.c
@@ -102,6 +102,7 @@ static int browser(void* param)
break;
#ifdef HAVE_TAGCACHE
case GO_TO_DBBROWSER:
+#if 0 /* Revert this for now */
if (!tagcache_is_usable())
{
bool reinit_attempted = false;
@@ -164,6 +165,13 @@ static int browser(void* param)
}
if (!tagcache_is_usable())
return GO_TO_PREVIOUS;
+#else /* The old code */
+ if ((last_screen != GO_TO_ROOT) && !tagcache_is_usable())
+ {
+ gui_syncsplash(0, true, str(LANG_TAGCACHE_BUSY));
+ return GO_TO_PREVIOUS;
+ }
+#endif /* Sorry for the interruption */
filter = SHOW_ID3DB;
tc->dirlevel = last_db_dirlevel;
break;