2 files changed, 27 insertions, 21 deletions

diff --git a/apps/main.c b/apps/main.c
index f9e6054973..0b35a61a75 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -128,25 +128,32 @@ static int init_dircache(bool preinit)
     if (preinit)
         dircache_init();
     
-    if (global_settings.dircache)
-    {
+    if (!global_settings.dircache)
+        return 0;
+    
 # ifdef HAVE_EEPROM_SETTINGS
-        if (firmware_settings.initialized && firmware_settings.disk_clean 
-            && preinit)
+    if (firmware_settings.initialized && firmware_settings.disk_clean 
+        && preinit)
+    {
+        result = dircache_load();
+
+        if (result < 0)
         {
-            result = dircache_load(DIRCACHE_FILE);
-            remove(DIRCACHE_FILE);
-            if (result < 0)
+            firmware_settings.disk_clean = false;
+            if (global_settings.dircache_size <= 0)
             {
-                firmware_settings.disk_clean = false;
-                if (global_settings.dircache_size >= 0)
-                    dircache_build(global_settings.dircache_size);
+                /* This will be in default language, settings are not
+                   applied yet. Not really any easy way to fix that. */
+                gui_syncsplash(0, true, str(LANG_DIRCACHE_BUILDING));
+                clear = true;
             }
-
-            return result;
+            
+            dircache_build(global_settings.dircache_size);
         }
+    }
+    else
 # endif
-        
+    {
         if (preinit)
             return -1;
         
@@ -163,12 +170,12 @@ static int init_dircache(bool preinit)
         
         if (result < 0)
             gui_syncsplash(0, true, "Failed! Result: %d", result);
-        
-        if (clear)
-        {
-            backlight_on();
-            show_logo();
-        }
+    }
+    
+    if (clear)
+    {
+        backlight_on();
+        show_logo();
         global_settings.dircache_size = dircache_get_cache_size();
         settings_save();
     }
diff --git a/apps/tree.c b/apps/tree.c
index 104344ee59..f0cf377041 100644
--- a/apps/tree.c
+++ b/apps/tree.c
@@ -1443,8 +1443,7 @@ void tree_flush(void)
         {
             global_settings.dircache_size = dircache_get_cache_size();
 # ifdef HAVE_EEPROM_SETTINGS
-            if (dircache_is_enabled() && firmware_settings.initialized)
-                dircache_save(DIRCACHE_FILE);
+            dircache_save();
 # endif
             dircache_disable();
         }