mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2015-06-03 11:19:26 +02:00
parent 14ca137ffb
commit 4c6f5b6a93
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
menu/menu_entry.c
View File

@ -236,9 +236,7 @@ uint32_t menu_entry_get_bool_value(uint32_t i)
void menu_entry_set_bool_value(uint32_t i, bool value) void menu_entry_set_bool_value(uint32_t i, bool value)
{ {
rarch_setting_t *setting = menu_entry_get_setting(i); rarch_setting_t *setting = menu_entry_get_setting(i);
setting_set_with_string_representation(setting, value ? "true" : "false");
if (setting)
setting_set_with_string_representation(setting, value ? "true" : "false");
} }
struct string_list *menu_entry_enum_values(uint32_t i) struct string_list *menu_entry_enum_values(uint32_t i)

17
menu/menu_setting.c
View File

@ -380,11 +380,11 @@ rarch_setting_t* setting_find_setting(rarch_setting_t* settings,
* Set a settings' value with a string. It is assumed * Set a settings' value with a string. It is assumed
* that the string has been properly formatted. * that the string has been properly formatted.
**/ **/
void setting_set_with_string_representation(rarch_setting_t* setting, int setting_set_with_string_representation(rarch_setting_t* setting,
const char* value) const char* value)
{ {
if (!setting || !value) if (!setting || !value)
return; return -1;
switch (setting->type) switch (setting->type)
{ {
@ -450,6 +450,8 @@ void setting_set_with_string_representation(rarch_setting_t* setting,
if (setting->change_handler) if (setting->change_handler)
setting->change_handler(setting); setting->change_handler(setting);
return 0;
} }
/** /**
@ -958,17 +960,12 @@ static int core_list_action_toggle(void *data, unsigned action, bool wraparound)
rarch_setting_t *setting = (rarch_setting_t *)data; rarch_setting_t *setting = (rarch_setting_t *)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!setting)
return -1;
/* If the user CANCELs the browse, then settings->libretro is now /* If the user CANCELs the browse, then settings->libretro is now
* set to a directory, which is very bad and will cause a crash * 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 * later on. I need to be able to add something to call when a
* cancel happens. * cancel happens.
*/ */
setting_set_with_string_representation(setting, settings->libretro_directory); return setting_set_with_string_representation(setting, settings->libretro_directory);
return 0;
} }
#endif #endif
@ -990,11 +987,9 @@ static int load_content_action_toggle(void *data, unsigned action,
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
global_t *global = global_get_ptr(); global_t *global = global_get_ptr();
if (!setting) if (setting_set_with_string_representation(setting, settings->menu_content_directory) != 0)
return -1; return -1;
setting_set_with_string_representation(setting, settings->menu_content_directory);
if (global->menu.info.valid_extensions) if (global->menu.info.valid_extensions)
setting->values = global->menu.info.valid_extensions; setting->values = global->menu.info.valid_extensions;
else else

2
menu/menu_setting.h
View File

@ -60,7 +60,7 @@ rarch_setting_t* setting_find_setting(rarch_setting_t* settings,
* Set a settings' value with a string. It is assumed * Set a settings' value with a string. It is assumed
* that the string has been properly formatted. * that the string has been properly formatted.
**/ **/
void setting_set_with_string_representation( int setting_set_with_string_representation(
rarch_setting_t* setting, const char* value); rarch_setting_t* setting, const char* value);
/** /**