ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanups

This commit is contained in:
twinaphex 2015-01-25 06:17:55 +01:00
parent 5b3865d687
commit 93d51f428f
3 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
menu/menu_action.c
View File

@ -18,7 +18,7 @@
#include "menu_entries.h"
#include "../retroarch.h"
static int setting_extra_handler(rarch_setting_t *setting)
int menu_action_generic_setting(rarch_setting_t *setting)
{
if (!setting)
return -1;
@ -77,7 +77,7 @@ int menu_action_setting_handler(rarch_setting_t *setting, unsigned action)
{
process_setting_handler(setting, action);
return setting_extra_handler(setting);
return menu_action_generic_setting(setting);
}
int menu_action_handle_setting(rarch_setting_t *setting,
@ -111,7 +111,7 @@ int menu_action_handle_setting(rarch_setting_t *setting,
break;
}
return setting_extra_handler(setting);
return menu_action_generic_setting(setting);
}
rarch_setting_t *menu_action_find_setting(const char *label)

2
menu/menu_action.h
View File

@ -23,6 +23,8 @@
extern "C" {
#endif
int menu_action_generic_setting(rarch_setting_t *setting);
int menu_action_setting_handler(
rarch_setting_t *setting, unsigned action);

15
menu/menu_entries_cbs.c
View File

@ -124,21 +124,6 @@ unsigned menu_gx_resolutions[GX_RESOLUTIONS_LAST][2] = {
unsigned menu_current_gx_resolution = GX_RESOLUTIONS_640_480;
#endif
static int menu_action_generic_setting(rarch_setting_t *setting)
{
if (setting->change_handler)
setting->change_handler(setting);
if (setting->flags & SD_FLAG_EXIT
&& setting->cmd_trigger.triggered)
{
setting->cmd_trigger.triggered = false;
return -1;
}
return 0;
}
int menu_action_setting_set_current_string(
rarch_setting_t *setting, const char *str)
{