diff options
author | Teruaki Kawashima <teru@rockbox.org> | 2009-07-11 13:35:08 +0000 |
---|---|---|
committer | Teruaki Kawashima <teru@rockbox.org> | 2009-07-11 13:35:08 +0000 |
commit | e976c51df8801a40a111c2c3d7fd0a30a0402b71 (patch) | |
tree | 843784dd9fb19152df2ffa81ee97eca7943c9b3d /apps/plugins | |
parent | 74d79cb92b5916eaedb7284b1b4ff47b06ffa08a (diff) | |
download | rockbox-e976c51df8801a40a111c2c3d7fd0a30a0402b71.tar.gz rockbox-e976c51df8801a40a111c2c3d7fd0a30a0402b71.zip |
Correct return value when quit sudoku from the menu.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21771 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/sudoku/sudoku.c | 10 | ||||
-rw-r--r-- | apps/plugins/sudoku/sudoku.h | 12 |
2 files changed, 12 insertions, 10 deletions
diff --git a/apps/plugins/sudoku/sudoku.c b/apps/plugins/sudoku/sudoku.c index da41a6986b..f8a438592d 100644 --- a/apps/plugins/sudoku/sudoku.c +++ b/apps/plugins/sudoku/sudoku.c | |||
@@ -1164,7 +1164,7 @@ enum { | |||
1164 | SM_QUIT, | 1164 | SM_QUIT, |
1165 | }; | 1165 | }; |
1166 | 1166 | ||
1167 | bool sudoku_menu(struct sudoku_state_t* state) | 1167 | int sudoku_menu(struct sudoku_state_t* state) |
1168 | { | 1168 | { |
1169 | int result; | 1169 | int result; |
1170 | 1170 | ||
@@ -1224,14 +1224,13 @@ bool sudoku_menu(struct sudoku_state_t* state) | |||
1224 | 1224 | ||
1225 | case SM_QUIT: | 1225 | case SM_QUIT: |
1226 | save_sudoku(state); | 1226 | save_sudoku(state); |
1227 | return true; | ||
1228 | break; | 1227 | break; |
1229 | 1228 | ||
1230 | default: | 1229 | default: |
1231 | break; | 1230 | break; |
1232 | } | 1231 | } |
1233 | 1232 | ||
1234 | return (result==MENU_ATTACHED_USB); | 1233 | return result; |
1235 | } | 1234 | } |
1236 | 1235 | ||
1237 | /* Menu used when user is in edit mode - i.e. creating a new game manually */ | 1236 | /* Menu used when user is in edit mode - i.e. creating a new game manually */ |
@@ -1518,9 +1517,12 @@ enum plugin_status plugin_start(const void* parameter) | |||
1518 | exit = true; | 1517 | exit = true; |
1519 | } | 1518 | } |
1520 | } else { | 1519 | } else { |
1521 | if (sudoku_menu(&state)) { | 1520 | res = sudoku_menu(&state); |
1521 | if (res == MENU_ATTACHED_USB) { | ||
1522 | rc = PLUGIN_USB_CONNECTED; | 1522 | rc = PLUGIN_USB_CONNECTED; |
1523 | exit = true; | 1523 | exit = true; |
1524 | } else if (res == SM_QUIT) { | ||
1525 | exit = true; | ||
1524 | } | 1526 | } |
1525 | } | 1527 | } |
1526 | } | 1528 | } |
diff --git a/apps/plugins/sudoku/sudoku.h b/apps/plugins/sudoku/sudoku.h index 54e04f12b2..75ceb1d3f2 100644 --- a/apps/plugins/sudoku/sudoku.h +++ b/apps/plugins/sudoku/sudoku.h | |||
@@ -135,13 +135,13 @@ | |||
135 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC | 135 | #define SUDOKU_BUTTON_POSSIBLE BUTTON_REC |
136 | 136 | ||
137 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) | 137 | #elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) |
138 | #define SUDOKU_BUTTON_QUIT (BUTTON_HOME|BUTTON_REPEAT) | 138 | #define SUDOKU_BUTTON_QUIT (BUTTON_HOME|BUTTON_REPEAT) |
139 | #define SUDOKU_BUTTON_UP BUTTON_UP | 139 | #define SUDOKU_BUTTON_UP BUTTON_UP |
140 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN | 140 | #define SUDOKU_BUTTON_DOWN BUTTON_DOWN |
141 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT | 141 | #define SUDOKU_BUTTON_LEFT BUTTON_LEFT |
142 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT | 142 | #define SUDOKU_BUTTON_RIGHT BUTTON_RIGHT |
143 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_BACK | 143 | #define SUDOKU_BUTTON_TOGGLEBACK BUTTON_SCROLL_BACK |
144 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_FWD | 144 | #define SUDOKU_BUTTON_TOGGLE BUTTON_SCROLL_FWD |
145 | #define SUDOKU_BUTTON_MENU (BUTTON_HOME | BUTTON_REL) | 145 | #define SUDOKU_BUTTON_MENU (BUTTON_HOME | BUTTON_REL) |
146 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_SELECT | BUTTON_UP) | 146 | #define SUDOKU_BUTTON_POSSIBLE (BUTTON_SELECT | BUTTON_UP) |
147 | 147 | ||