diff options
Diffstat (limited to 'apps')
-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 c2ffb07b70..f33eedc3f9 100644 --- a/apps/main_menu.c +++ b/apps/main_menu.c | |||
@@ -106,6 +106,7 @@ int show_logo( void ) | |||
106 | void show_credits(void) | 106 | void show_credits(void) |
107 | { | 107 | { |
108 | int j = 0; | 108 | int j = 0; |
109 | int btn; | ||
109 | 110 | ||
110 | show_logo(); | 111 | show_logo(); |
111 | #ifdef HAVE_NEW_CHARCELL_LCD | 112 | #ifdef HAVE_NEW_CHARCELL_LCD |
@@ -115,7 +116,8 @@ void show_credits(void) | |||
115 | for (j = 0; j < 10; j++) { | 116 | for (j = 0; j < 10; j++) { |
116 | sleep((HZ*2)/10); | 117 | sleep((HZ*2)/10); |
117 | 118 | ||
118 | if (button_get(false)) | 119 | btn = button_get(false); |
120 | if (btn != BUTTON_NONE && !(btn & BUTTON_REL)) | ||
119 | return; | 121 | return; |
120 | } | 122 | } |
121 | roll_credits(); | 123 | roll_credits(); |
@@ -150,13 +152,9 @@ void show_info(void) | |||
150 | lcd_puts(0, 3, s); | 152 | lcd_puts(0, 3, s); |
151 | 153 | ||
152 | lcd_update(); | 154 | lcd_update(); |
153 | |||
154 | button_get(true); | ||
155 | } | ||
156 | 155 | ||
157 | void hold_set(void) | 156 | /* Wait for a key to be pushed */ |
158 | { | 157 | while(button_get(true) & BUTTON_REL); |
159 | set_bool( "[Hold]", &global_settings.hold ); | ||
160 | } | 158 | } |
161 | 159 | ||
162 | void main_menu(void) | 160 | void main_menu(void) |
@@ -165,7 +163,6 @@ void main_menu(void) | |||
165 | 163 | ||
166 | /* main menu */ | 164 | /* main menu */ |
167 | struct menu_items items[] = { | 165 | struct menu_items items[] = { |
168 | { "Hold", hold_set }, | ||
169 | { "Sound Settings", sound_menu }, | 166 | { "Sound Settings", sound_menu }, |
170 | { "General Settings", settings_menu }, | 167 | { "General Settings", settings_menu }, |
171 | #ifdef HAVE_LCD_BITMAP | 168 | #ifdef HAVE_LCD_BITMAP |