diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-18 06:31:33 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-03-18 06:31:33 +0000 |
| commit | b5e587c0811e670efaf19cd81c32e0035a276fdb (patch) | |
| tree | ef49e9900f4d4a2c3375df297c15a2ab5bacd8d7 /apps/menu.h | |
| parent | 7d7135165dd31d60b08530d2ae225f5223f4d5ea (diff) | |
| download | rockbox-b5e587c0811e670efaf19cd81c32e0035a276fdb.tar.gz rockbox-b5e587c0811e670efaf19cd81c32e0035a276fdb.zip | |
Fix improper shift and mask order causing FS#6842
Set start_selected if exiting do_menu() early from more places
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12826 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/menu.h')
| -rw-r--r-- | apps/menu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/apps/menu.h b/apps/menu.h index 6d7d113c8c..ded25500bf 100644 --- a/apps/menu.h +++ b/apps/menu.h | |||
| @@ -61,6 +61,7 @@ struct menu_func { | |||
| 61 | #define MENU_COUNT_MASK 0xFFF | 61 | #define MENU_COUNT_MASK 0xFFF |
| 62 | #define MENU_COUNT_SHIFT 8 | 62 | #define MENU_COUNT_SHIFT 8 |
| 63 | #define MENU_ITEM_COUNT(c) ((c&MENU_COUNT_MASK)<<MENU_COUNT_SHIFT) | 63 | #define MENU_ITEM_COUNT(c) ((c&MENU_COUNT_MASK)<<MENU_COUNT_SHIFT) |
| 64 | #define MENU_GET_COUNT(flags) ((flags>>MENU_COUNT_SHIFT)&MENU_COUNT_MASK) | ||
| 64 | 65 | ||
| 65 | struct menu_item_ex { | 66 | struct menu_item_ex { |
| 66 | unsigned int flags; /* above defines */ | 67 | unsigned int flags; /* above defines */ |