Show splash during init, no delay

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

2 files changed, 4 insertions, 6 deletions

diff --git a/apps/main.c b/apps/main.c
index 0bfb00de2c..674211941f 100644
--- a/apps/main.c
+++ b/apps/main.c
@@ -36,7 +36,6 @@
 
 void app_main(void)
 {
-    show_splash();
     browse_root();
 }
 
@@ -50,6 +49,10 @@ int init(void)
 {
     int rc;
 
+#ifdef HAVE_LCD_BITMAP
+    lcd_init();
+#endif
+    show_splash();
     dmalloc_initialize();
     bmalloc_add_pool(poolstart, poolend-poolstart);
 
diff --git a/apps/main_menu.c b/apps/main_menu.c
index 31fe73bdde..e3eb240b1d 100644
--- a/apps/main_menu.c
+++ b/apps/main_menu.c
@@ -97,11 +97,6 @@ void show_splash(void)
 #endif
 
     lcd_update();
-    for ( i=0;i<10;i++) {
-        sleep(HZ/10);
-        if (button_get(false))
-            break;
-    }
 }
 
 void main_menu(void)