diff options
Diffstat (limited to 'apps/menus')
-rw-r--r-- | apps/menus/main_menu.c | 6 | ||||
-rw-r--r-- | apps/menus/time_menu.c | 13 |
2 files changed, 8 insertions, 11 deletions
diff --git a/apps/menus/main_menu.c b/apps/menus/main_menu.c index 505801d3cc..783490284c 100644 --- a/apps/menus/main_menu.c +++ b/apps/menus/main_menu.c | |||
@@ -415,13 +415,13 @@ static int sleep_timer(void) | |||
415 | 415 | ||
416 | #if CONFIG_RTC | 416 | #if CONFIG_RTC |
417 | int time_screen(void* ignored); | 417 | int time_screen(void* ignored); |
418 | MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), time_screen, | 418 | MENUITEM_FUNCTION(timedate_item, MENU_FUNC_CHECK_RETVAL, ID2P(LANG_TIME_MENU), |
419 | NULL, NULL, Icon_Menu_setting ); | 419 | time_screen, NULL, NULL, Icon_Menu_setting ); |
420 | #endif | 420 | #endif |
421 | /* This item is in the time/date screen if there is a RTC */ | 421 | /* This item is in the time/date screen if there is a RTC */ |
422 | MENUITEM_FUNCTION(sleep_timer_call, 0, ID2P(LANG_SLEEP_TIMER), sleep_timer, | 422 | MENUITEM_FUNCTION(sleep_timer_call, 0, ID2P(LANG_SLEEP_TIMER), sleep_timer, |
423 | NULL, NULL, Icon_Menu_setting); /* make it look like a | 423 | NULL, NULL, Icon_Menu_setting); /* make it look like a |
424 | setting to the user */ | 424 | setting to the user */ |
425 | 425 | ||
426 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), | 426 | MENUITEM_FUNCTION(show_credits_item, 0, ID2P(LANG_CREDITS), |
427 | (menu_function)show_credits, NULL, NULL, Icon_NOICON); | 427 | (menu_function)show_credits, NULL, NULL, Icon_NOICON); |
diff --git a/apps/menus/time_menu.c b/apps/menus/time_menu.c index 757ce82928..597f7e0c3a 100644 --- a/apps/menus/time_menu.c +++ b/apps/menus/time_menu.c | |||
@@ -62,10 +62,10 @@ static int timedate_set(void) | |||
62 | #define C2DIG2DEC(x) (S100(x)-100) | 62 | #define C2DIG2DEC(x) (S100(x)-100) |
63 | 63 | ||
64 | tm.tm_hour = 0; | 64 | tm.tm_hour = 0; |
65 | tm.tm_min = 0; | 65 | tm.tm_min = 0; |
66 | tm.tm_sec = 0; | 66 | tm.tm_sec = 0; |
67 | tm.tm_mday = C2DIG2DEC(DAY); | 67 | tm.tm_mday = C2DIG2DEC(DAY); |
68 | tm.tm_mon = C2DIG2DEC(MONTH)-1; | 68 | tm.tm_mon = C2DIG2DEC(MONTH)-1; |
69 | tm.tm_wday = 1; | 69 | tm.tm_wday = 1; |
70 | tm.tm_year = YEAR-1900; | 70 | tm.tm_year = YEAR-1900; |
71 | } | 71 | } |
@@ -193,8 +193,8 @@ static void draw_timedate(struct viewport *vp, struct screen *display) | |||
193 | d = str(LANG_UNKNOWN); | 193 | d = str(LANG_UNKNOWN); |
194 | } | 194 | } |
195 | 195 | ||
196 | display->puts_scroll(0, line++, t); | 196 | display->puts(0, line++, t); |
197 | display->puts_scroll(0, line, d); | 197 | display->puts(0, line, d); |
198 | 198 | ||
199 | display->update_viewport(); | 199 | display->update_viewport(); |
200 | display->set_viewport(NULL); | 200 | display->set_viewport(NULL); |
@@ -284,9 +284,6 @@ int time_screen(void* ignored) | |||
284 | } | 284 | } |
285 | 285 | ||
286 | ret = do_menu(&time_menu, NULL, menu, false); | 286 | ret = do_menu(&time_menu, NULL, menu, false); |
287 | FOR_NB_SCREENS(i) | ||
288 | screens[i].scroll_stop(&clock[i]); | ||
289 | |||
290 | /* see comments above in the button callback */ | 287 | /* see comments above in the button callback */ |
291 | if (!menu_was_pressed && ret == GO_TO_PREVIOUS) | 288 | if (!menu_was_pressed && ret == GO_TO_PREVIOUS) |
292 | return 0; | 289 | return 0; |