From 3b52bb9c68665c6860c7da6f8ee0b3d8fe26d53d Mon Sep 17 00:00:00 2001
From: Miika Pekkarinen <miipekk@ihme.org>
Date: Fri, 11 Aug 2006 10:13:16 +0000
Subject: 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
---
 apps/main.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'apps/main.c')

diff --git a/apps/main.c b/apps/main.c
index d590790a85..a3fe8ef64f 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -338,9 +338,17 @@ void init(void)
         panicf("ata: %d", rc);
     }
 
+#ifdef HAVE_EEPROM
+    eeprom_settings_init();
+#endif
+    
     usb_start_monitoring();
     while (usb_detect())
-    {   /* enter USB mode early, before trying to mount */
+    {   
+#ifdef HAVE_EEPROM
+        firmware_settings.disk_clean = false;
+#endif
+        /* enter USB mode early, before trying to mount */
         if (button_get_w_tmo(HZ/10) == SYS_USB_CONNECTED)
 #ifdef HAVE_MMC
             if (!mmc_touched() || (mmc_remove_request() == SYS_MMC_EXTRACTED))
@@ -374,10 +382,6 @@ void init(void)
         }
     }
 
-#ifdef HAVE_EEPROM
-    eeprom_settings_init();
-#endif
-    
     settings_calc_config_sector();
     
 #if defined(SETTINGS_RESET) || (CONFIG_KEYPAD == IPOD_4G_PAD)
-- 
cgit v1.2.3