Properly handle early USB mode, dircache and tagcache state files with

flashed rockbox.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10525 a1c6a512-1295-4272-9138-f99709370657

1 files changed, 6 insertions, 4 deletions

diff --git a/apps/tree.c b/apps/tree.c
index 1dbe9223b9..0dd03779a5 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -1368,16 +1368,14 @@ void tree_flush(void)
 #ifdef HAVE_TC_RAMCACHE
     tagcache_unload_ramcache();
 #endif
-    
+
 #ifdef HAVE_DIRCACHE
     if (global_settings.dircache)
     {
+        global_settings.dircache_size = dircache_get_cache_size();
 # ifdef HAVE_EEPROM
         if (dircache_is_enabled() && firmware_settings.initialized)
-        {
-            global_settings.dircache_size = dircache_get_cache_size();
             dircache_save(DIRCACHE_FILE);
-        }
 # endif
         dircache_disable();
     }
@@ -1395,6 +1393,10 @@ void tree_restore(void)
     firmware_settings.disk_clean = false;
 #endif
     
+#ifdef HAVE_TC_RAMCACHE
+    remove(TAGCACHE_STATEFILE);
+#endif
+    
 #ifdef HAVE_DIRCACHE
     remove(DIRCACHE_FILE);
     if (global_settings.dircache)