Merge branch 'dev'

Author: ducalex

CHANGELOG.md

@@ -1,3 +1,7 @@
+# Retro-Go 1.36.3 (2022-12-14)
+- SNES: Fixed freeze in controls menu (hopefully for real this time...)
+
+
 # Retro-Go 1.36.2 (2022-12-07)
 - SNES: Fixed crash in controls menu
 - Launcher: Start wifi access point

components/retro-go/rg_gui.c

@@ -813,7 +813,7 @@ int rg_gui_dialog(const char *title, const rg_gui_option_t *options_const, int s
     free(text_buffer);
 
     if (sel == -1)
-        return -1;
+        return RG_DIALOG_CANCELLED;
 
     return options[sel].arg;
 }

snes9x-go/main/main.c

@@ -128,22 +128,25 @@ static rg_gui_event_t menu_keymap_cb(rg_gui_option_t *option, rg_gui_event_t eve
 {
     if (event == RG_DIALOG_ENTER)
     {
-        rg_gui_option_t options[RG_COUNT(keymap.keys) + 4];
-        char values[RG_COUNT(keymap.keys)][16];
-        char profile[32];
         bool dismissed = false;
 
         while (!dismissed)
         {
+            rg_gui_option_t options[keymap.size + 4];
             rg_gui_option_t *option = options;
+            char values[keymap.size][20];
+            char profile[32];
 
             option->label = "Profile";
             option->value = strcat(strcat(strcpy(profile, "< "), keymap.name), " >");
             option->flags = RG_DIALOG_FLAG_NORMAL;
             option->update_cb = &change_keymap_cb;
             option++;
 
+            option->label = "";
+            option->value = NULL;
             option->flags = RG_DIALOG_FLAG_NORMAL;
+            option->update_cb = &change_keymap_cb;
             option++;
 
             option->label = "snes9x  ";