1.40a fixes

[libpicofe.git] / gp2x / menu.c

diff --git a/gp2x/menu.c b/gp2x/menu.c
index 506b7c4..55995b9 100644 (file)
--- a/gp2x/menu.c
+++ b/gp2x/menu.c
@@ -124,6 +124,8 @@ static unsigned long wait_for_input_usbjoy(unsigned long interesting, int *joy)
        // handle only 1 event at a time\r
        for (i = 1; i != 0; i <<= 1)\r
                if (ret & i) { ret &= i; break; }\r
+       // ... but allow select\r
+       ret |= inp_prev & GP2X_SELECT;\r
 \r
        return ret;\r
 }\r
@@ -780,7 +782,8 @@ static void key_config_loop(const me_bind_action *opts, int opt_cnt, int player_
                draw_key_config(opts, opt_cnt, player_idx, sel);\r
                inp = wait_for_input_usbjoy(CONFIGURABLE_KEYS, &joy);\r
                // printf("got %08lX from joy %i\n", inp, joy);\r
-               if (joy == 0) {\r
+               if (joy == 0)\r
+               {\r
                        if (!(inp & GP2X_SELECT)) {\r
                                prev_select = 0;\r
                                if(inp & GP2X_UP  ) { sel--; if (sel < 0) sel = menu_sel_max; continue; }\r