diff options
| author | Linus Nielsen Feltzing <linus@haxx.se> | 2002-07-24 16:57:21 +0000 |
|---|---|---|
| committer | Linus Nielsen Feltzing <linus@haxx.se> | 2002-07-24 16:57:21 +0000 |
| commit | ebfff5a43d9f89d792e6b8f41af248e87a1ac8b4 (patch) | |
| tree | a33a18e28f286dc88367aacb7806eae2ddfbd8db | |
| parent | ae9c3f5dc8faec53b0ca9e1270f9d56a1c7eeca0 (diff) | |
| download | rockbox-ebfff5a43d9f89d792e6b8f41af248e87a1ac8b4.zip rockbox-ebfff5a43d9f89d792e6b8f41af248e87a1ac8b4.tar.gz rockbox-ebfff5a43d9f89d792e6b8f41af248e87a1ac8b4.tar.bz2 rockbox-ebfff5a43d9f89d792e6b8f41af248e87a1ac8b4.tar.xz | |
Better handling of key-up event in show_info() and show_credits()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1436 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/main_menu.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/apps/main_menu.c b/apps/main_menu.c index c2ffb07..f33eedc 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c @@ -106,6 +106,7 @@ int show_logo( void ) void show_credits(void) { int j = 0; + int btn; show_logo(); #ifdef HAVE_NEW_CHARCELL_LCD @@ -115,7 +116,8 @@ void show_credits(void) for (j = 0; j < 10; j++) { sleep((HZ*2)/10); - if (button_get(false)) + btn = button_get(false); + if (btn != BUTTON_NONE && !(btn & BUTTON_REL)) return; } roll_credits(); @@ -150,13 +152,9 @@ void show_info(void) lcd_puts(0, 3, s); lcd_update(); - - button_get(true); -} -void hold_set(void) -{ - set_bool( "[Hold]", &global_settings.hold ); + /* Wait for a key to be pushed */ + while(button_get(true) & BUTTON_REL); } void main_menu(void) @@ -165,7 +163,6 @@ void main_menu(void) /* main menu */ struct menu_items items[] = { - { "Hold", hold_set }, { "Sound Settings", sound_menu }, { "General Settings", settings_menu }, #ifdef HAVE_LCD_BITMAP |