summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Stenberg <bjorn@haxx.se>2002-05-29 09:12:21 +0000
committerBjörn Stenberg <bjorn@haxx.se>2002-05-29 09:12:21 +0000
commit6c890966a421bfcdd5ca522eb4cdf9ec36f50acd (patch)
treef328cd95119e2acc46faac9325ee5148bfdba460
parent951fe18a409fd38858365e2f47eb6f27dce2a834 (diff)
downloadrockbox-6c890966a421bfcdd5ca522eb4cdf9ec36f50acd.zip
rockbox-6c890966a421bfcdd5ca522eb4cdf9ec36f50acd.tar.gz
rockbox-6c890966a421bfcdd5ca522eb4cdf9ec36f50acd.tar.bz2
rockbox-6c890966a421bfcdd5ca522eb4cdf9ec36f50acd.tar.xz
Show splash during init, no delay
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@781 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--apps/main.c5
-rw-r--r--apps/main_menu.c5
2 files changed, 4 insertions, 6 deletions
diff --git a/apps/main.c b/apps/main.c
index 0bfb00d..6742119 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 31fe73b..e3eb240 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)