libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2025-02-21 10:11:18 +00:00
Code Issues Actions 24 Packages Projects Releases Wiki Activity

Merge pull request #12206 from jdgleaver/max-user-reinit

Browse Source 
Ensure that 'retro_set_controller_port_device' is called when updating 'Max Users'
This commit is contained in:
Autechre 2021-03-30 08:36:07 +02:00 committed by GitHub
commit e3ee0ac22b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
command.h
View File

@ -205,7 +205,8 @@ enum event_command
CMD_EVENT_CHEAT_INDEX_MINUS, CMD_EVENT_CHEAT_INDEX_MINUS,
CMD_EVENT_CHEAT_TOGGLE, CMD_EVENT_CHEAT_TOGGLE,
CMD_EVENT_AI_SERVICE_CALL, CMD_EVENT_AI_SERVICE_CALL,
CMD_EVENT_SAVE_FILES CMD_EVENT_SAVE_FILES,
CMD_EVENT_CONTROLLER_INIT
}; };
typedef struct command command_t; typedef struct command command_t;

8
menu/menu_setting.c
View File

@ -7234,6 +7234,14 @@ static void general_write_handler(rarch_setting_t *setting)
if (!settings->bools.video_fullscreen) if (!settings->bools.video_fullscreen)
rarch_cmd = CMD_EVENT_REINIT; rarch_cmd = CMD_EVENT_REINIT;
break; break;
case MENU_ENUM_LABEL_INPUT_MAX_USERS:
{
bool refresh = false;
command_event(CMD_EVENT_CONTROLLER_INIT, NULL);
menu_entries_ctl(MENU_ENTRIES_CTL_SET_REFRESH, &refresh);
menu_driver_ctl(RARCH_MENU_CTL_SET_PREVENT_POPULATE, NULL);
}
break;
case MENU_ENUM_LABEL_INPUT_PLAYER1_JOYPAD_INDEX: case MENU_ENUM_LABEL_INPUT_PLAYER1_JOYPAD_INDEX:
settings->modified = true; settings->modified = true;
settings->uints.input_joypad_map[0] = *setting->value.target.integer; settings->uints.input_joypad_map[0] = *setting->value.target.integer;

5
retroarch.c
View File

@ -15125,6 +15125,9 @@ bool command_event(enum event_command cmd, void *data)
#endif #endif
break; break;
} }
case CMD_EVENT_CONTROLLER_INIT:
command_event_init_controllers(p_rarch);
break;
case CMD_EVENT_NONE: case CMD_EVENT_NONE:
return false; return false;
} }
@ -35238,7 +35241,7 @@ bool retroarch_main_init(int argc, char *argv[])
#ifdef HAVE_REWIND #ifdef HAVE_REWIND
command_event(CMD_EVENT_REWIND_INIT, NULL); command_event(CMD_EVENT_REWIND_INIT, NULL);
#endif #endif
command_event_init_controllers(p_rarch); command_event(CMD_EVENT_CONTROLLER_INIT, NULL);
if (!string_is_empty(global->record.path)) if (!string_is_empty(global->record.path))
command_event(CMD_EVENT_RECORD_INIT, NULL); command_event(CMD_EVENT_RECORD_INIT, NULL);