diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2005-08-18 09:18:40 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2005-08-18 09:18:40 +0000 |
commit | 82ac901095eb74e18e0474957ef5c1e0d52b4e8b (patch) | |
tree | 71571500438ecf93b824497c0867b94260299a2b /apps/recorder/radio.c | |
parent | 57d8e8fe0c878fa9fdf806cfd0184ccbd53986ed (diff) | |
download | rockbox-82ac901095eb74e18e0474957ef5c1e0d52b4e8b.tar.gz rockbox-82ac901095eb74e18e0474957ef5c1e0d52b4e8b.zip |
iriver: Radio screen didn't properly filter stray FM_EXIT events
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7349 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder/radio.c')
-rw-r--r-- | apps/recorder/radio.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 286fd16e9d..67306ac2b0 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -72,6 +72,7 @@ | |||
72 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD | 72 | #elif CONFIG_KEYPAD == IRIVER_H100_PAD |
73 | #define FM_MENU BUTTON_MODE | 73 | #define FM_MENU BUTTON_MODE |
74 | #define FM_STOP BUTTON_OFF | 74 | #define FM_STOP BUTTON_OFF |
75 | #define FM_EXIT_PRE BUTTON_SELECT | ||
75 | #define FM_EXIT (BUTTON_SELECT | BUTTON_REL) | 76 | #define FM_EXIT (BUTTON_SELECT | BUTTON_REL) |
76 | #elif CONFIG_KEYPAD == ONDIO_PAD /* restricted keypad */ | 77 | #elif CONFIG_KEYPAD == ONDIO_PAD /* restricted keypad */ |
77 | #define FM_MENU (BUTTON_MENU | BUTTON_REPEAT) | 78 | #define FM_MENU (BUTTON_MENU | BUTTON_REPEAT) |
@@ -341,6 +342,10 @@ bool radio_screen(void) | |||
341 | #endif /* #ifdef FM_RECORD */ | 342 | #endif /* #ifdef FM_RECORD */ |
342 | 343 | ||
343 | case FM_EXIT: | 344 | case FM_EXIT: |
345 | #ifdef FM_EXIT_PRE | ||
346 | if(lastbutton != FM_EXIT_PRE) | ||
347 | break; | ||
348 | #endif | ||
344 | #ifndef SIMULATOR | 349 | #ifndef SIMULATOR |
345 | if(audio_status() == AUDIO_STATUS_RECORD) | 350 | if(audio_status() == AUDIO_STATUS_RECORD) |
346 | audio_stop(); | 351 | audio_stop(); |