mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups/build fix

Browse Source
This commit is contained in:
twinaphex 2015-01-07 15:49:56 +01:00
parent a4b92ca74c
commit 1a0f817893
1 changed files with 38 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
settings_data.c
View File

@ -22,6 +22,7 @@
#include "input/input_common.h" #include "input/input_common.h"
#include "config.def.h" #include "config.def.h"
#include "retroarch_logger.h" #include "retroarch_logger.h"
#include "file_ext.h"
#if defined(__CELLOS_LV2__) #if defined(__CELLOS_LV2__)
#include <sdk_version.h> #include <sdk_version.h>
@ -2834,39 +2835,51 @@ static void settings_data_list_current_add_flags(
setting_data_add_special_callbacks(list, list_info, values); setting_data_add_special_callbacks(list, list_info, values);
} }
int core_list_action_toggle(void *data, unsigned action) { int core_list_action_toggle(void *data, unsigned action)
rarch_setting_t *setting = (rarch_setting_t *)data; {
// If the user CANCELs the browse, then g_settings.libretro is now rarch_setting_t *setting = (rarch_setting_t *)data;
// set to a directory, which is very bad and will cause a crash
// later on. I need to be able to add something to call when a /* If the user CANCELs the browse, then g_settings.libretro is now
// cancel happens. * set to a directory, which is very bad and will cause a crash
strlcpy(setting->value.string, g_settings.libretro_directory, setting->size); * later on. I need to be able to add something to call when a
return 0; * cancel happens.
*/
strlcpy(setting->value.string, g_settings.libretro_directory, setting->size);
return 0;
} }
void core_list_change_handler(void *data) {
void core_list_change_handler(void *data)
{
rarch_setting_t *setting = (rarch_setting_t *)data; rarch_setting_t *setting = (rarch_setting_t *)data;
(void)setting;
rarch_main_command(RARCH_CMD_LOAD_CORE); rarch_main_command(RARCH_CMD_LOAD_CORE);
} }
int load_content_action_toggle(void *data, unsigned action) { int load_content_action_toggle(void *data, unsigned action)
rarch_setting_t *setting = (rarch_setting_t *)data; {
rarch_setting_t *setting = (rarch_setting_t *)data;
strlcpy(setting->value.string, g_settings.menu_content_directory, setting->size); strlcpy(setting->value.string, g_settings.menu_content_directory, setting->size);
if (g_extern.menu.info.valid_extensions) { if (g_extern.menu.info.valid_extensions)
setting->values = g_extern.menu.info.valid_extensions; setting->values = g_extern.menu.info.valid_extensions;
} else { else
setting->values = g_extern.system.valid_extensions; setting->values = g_extern.system.valid_extensions;
}
return 0;
return 0;
} }
void load_content_change_handler(void *data) { void load_content_change_handler(void *data)
rarch_setting_t *setting = (rarch_setting_t *)data; {
// This does not appear to be robust enough because sometimes I get rarch_setting_t *setting = (rarch_setting_t *)data;
// crashes. I think it is because LOAD_CORE has not yet run. I'm not (void)setting;
// sure the best way to test for that.
rarch_main_command(RARCH_CMD_LOAD_CONTENT); /* This does not appear to be robust enough because sometimes I get
* crashes. I think it is because LOAD_CORE has not yet run. I'm not
* sure the best way to test for that.
*/
rarch_main_command(RARCH_CMD_LOAD_CONTENT);
} }
static bool setting_data_append_list_main_menu_options( static bool setting_data_append_list_main_menu_options(