(RGUI) Fix RGUI 'Core' setting

This commit is contained in:
twinaphex 2013-04-08 01:51:18 +02:00
parent c33c634dc4
commit 99945f43a6
2 changed files with 3 additions and 6 deletions

View File

@ -994,7 +994,7 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui)
{ {
rgui_list_clear(rgui->selection_buf); rgui_list_clear(rgui->selection_buf);
#ifdef HAVE_DYNAMIC #if defined(HAVE_DYNAMIC) || defined(HAVE_LIBRETRO_MANAGEMENT)
rgui_list_push(rgui->selection_buf, "Core", RGUI_SETTINGS_CORE, 0); rgui_list_push(rgui->selection_buf, "Core", RGUI_SETTINGS_CORE, 0);
#endif #endif
rgui_list_push(rgui->selection_buf, "Core Options", RGUI_SETTINGS_CORE_OPTIONS, 0); rgui_list_push(rgui->selection_buf, "Core Options", RGUI_SETTINGS_CORE_OPTIONS, 0);
@ -1030,9 +1030,6 @@ static void rgui_settings_populate_entries(rgui_handle_t *rgui)
#ifdef GEKKO #ifdef GEKKO
rgui_list_push(rgui->selection_buf, "SRAM Saves in \"sram\" Dir", RGUI_SETTINGS_SRAM_DIR, 0); rgui_list_push(rgui->selection_buf, "SRAM Saves in \"sram\" Dir", RGUI_SETTINGS_SRAM_DIR, 0);
rgui_list_push(rgui->selection_buf, "State Saves in \"state\" Dir", RGUI_SETTINGS_STATE_DIR, 0); rgui_list_push(rgui->selection_buf, "State Saves in \"state\" Dir", RGUI_SETTINGS_STATE_DIR, 0);
#endif
#ifdef HAVE_LIBRETRO_MANAGEMENT
rgui_list_push(rgui->selection_buf, "Core", RGUI_SETTINGS_CORE, 0);
#endif #endif
rgui_list_push(rgui->selection_buf, "Controller #1 Config", RGUI_SETTINGS_CONTROLLER_1, 0); rgui_list_push(rgui->selection_buf, "Controller #1 Config", RGUI_SETTINGS_CONTROLLER_1, 0);
rgui_list_push(rgui->selection_buf, "Controller #2 Config", RGUI_SETTINGS_CONTROLLER_2, 0); rgui_list_push(rgui->selection_buf, "Controller #2 Config", RGUI_SETTINGS_CONTROLLER_2, 0);
@ -1371,7 +1368,7 @@ static int rgui_settings_iterate(rgui_handle_t *rgui, rgui_action_t action)
rgui_list_push(rgui->menu_stack, rgui->base_path, RGUI_FILE_DIRECTORY, rgui->selection_ptr); rgui_list_push(rgui->menu_stack, rgui->base_path, RGUI_FILE_DIRECTORY, rgui->selection_ptr);
rgui->need_refresh = true; rgui->need_refresh = true;
} }
else if (menu_type_is_settings(type) && action == RGUI_ACTION_OK) else if ((menu_type_is_settings(type) || type == RGUI_SETTINGS_CORE) && action == RGUI_ACTION_OK)
{ {
rgui_list_push(rgui->menu_stack, label, type, rgui->selection_ptr); rgui_list_push(rgui->menu_stack, label, type, rgui->selection_ptr);
rgui->selection_ptr = 0; rgui->selection_ptr = 0;

View File

@ -54,6 +54,7 @@ typedef enum
// settings options are done here too // settings options are done here too
RGUI_SETTINGS_OPEN_FILEBROWSER, RGUI_SETTINGS_OPEN_FILEBROWSER,
RGUI_SETTINGS_CORE,
RGUI_SETTINGS_CORE_OPTIONS, RGUI_SETTINGS_CORE_OPTIONS,
RGUI_SETTINGS_REWIND_ENABLE, RGUI_SETTINGS_REWIND_ENABLE,
RGUI_SETTINGS_REWIND_GRANULARITY, RGUI_SETTINGS_REWIND_GRANULARITY,
@ -78,7 +79,6 @@ typedef enum
RGUI_SETTINGS_ZIP_EXTRACT, RGUI_SETTINGS_ZIP_EXTRACT,
RGUI_SETTINGS_SRAM_DIR, RGUI_SETTINGS_SRAM_DIR,
RGUI_SETTINGS_STATE_DIR, RGUI_SETTINGS_STATE_DIR,
RGUI_SETTINGS_CORE,
RGUI_SETTINGS_CONTROLLER_1, RGUI_SETTINGS_CONTROLLER_1,
RGUI_SETTINGS_CONTROLLER_2, RGUI_SETTINGS_CONTROLLER_2,
RGUI_SETTINGS_CONTROLLER_3, RGUI_SETTINGS_CONTROLLER_3,