diff options
author | Christi Scarborough <christi@coraline.org> | 2005-02-05 19:57:19 +0000 |
---|---|---|
committer | Christi Scarborough <christi@coraline.org> | 2005-02-05 19:57:19 +0000 |
commit | eeed057b8b1478cd863d36089b4a21dc4a95d6aa (patch) | |
tree | 610e884315e2efa0eeff9a9ed5501dd4a5cbbdb6 /apps/tree.c | |
parent | c3c26262f45548ad9e920d0d635a745d6829227b (diff) | |
download | rockbox-eeed057b8b1478cd863d36089b4a21dc4a95d6aa.tar.gz rockbox-eeed057b8b1478cd863d36089b4a21dc4a95d6aa.zip |
Bugfix: Resume does not prompt if the unit has woken due to the RTC alarm
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5799 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/tree.c')
-rw-r--r-- | apps/tree.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/apps/tree.c b/apps/tree.c index d59101f937..02899f87ca 100644 --- a/apps/tree.c +++ b/apps/tree.c | |||
@@ -60,6 +60,7 @@ | |||
60 | #include "filetree.h" | 60 | #include "filetree.h" |
61 | #include "dbtree.h" | 61 | #include "dbtree.h" |
62 | #include "recorder/recording.h" | 62 | #include "recorder/recording.h" |
63 | #include "rtc.h" | ||
63 | 64 | ||
64 | #ifdef HAVE_LCD_BITMAP | 65 | #ifdef HAVE_LCD_BITMAP |
65 | #include "widgets.h" | 66 | #include "widgets.h" |
@@ -434,8 +435,11 @@ static bool ask_resume(bool ask_once) | |||
434 | return false; | 435 | return false; |
435 | } | 436 | } |
436 | 437 | ||
438 | if ( rtc_check_alarm_started(true) ) | ||
439 | return true; | ||
440 | |||
437 | /* always resume? */ | 441 | /* always resume? */ |
438 | if ( global_settings.resume == RESUME_ON ) | 442 | if ( global_settings.resume == RESUME_ON) |
439 | return true; | 443 | return true; |
440 | 444 | ||
441 | lcd_clear_display(); | 445 | lcd_clear_display(); |