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

Create menu_settings_apply_deferred

This commit is contained in:
twinaphex 2015-08-17 15:54:23 +02:00
parent fa177cb291
commit 0218a2755d
4 changed files with 62 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/menu_entry.c
View File

@ -43,7 +43,7 @@ int menu_entry_go_back(void)
if (!menu_list) if (!menu_list)
return -1; return -1;
menu_setting_apply_deferred(); menu_settings_apply_deferred();
menu_list_pop_stack(menu_list); menu_list_pop_stack(menu_list);
if (menu_entries_needs_refresh()) if (menu_entries_needs_refresh())

24
menu/menu_setting.c
View File

@ -363,20 +363,16 @@ int menu_setting_set(unsigned type, const char *label,
return ret; return ret;
} }
void menu_setting_apply_deferred(void) int menu_setting_apply_deferred(rarch_setting_t *setting)
{ {
rarch_setting_t *setting = menu_setting_get_ptr();
if (!setting) if (!setting)
return; return -1;
for (; setting->type != ST_NONE; setting++)
{
if (setting->type >= ST_GROUP) if (setting->type >= ST_GROUP)
continue; return -1;
if (!(setting->flags & SD_FLAG_IS_DEFERRED)) if (!(setting->flags & SD_FLAG_IS_DEFERRED))
continue; return -1;
switch (setting->type) switch (setting->type)
{ {
@ -418,7 +414,19 @@ void menu_setting_apply_deferred(void)
default: default:
break; break;
} }
return 0;
} }
void menu_settings_apply_deferred(void)
{
rarch_setting_t *setting = menu_setting_get_ptr();
if (!setting)
return;
for (; setting->type != ST_NONE; setting++)
menu_setting_apply_deferred(setting);
} }

4
menu/menu_setting.h
View File

@ -216,7 +216,9 @@ typedef struct rarch_setting
void menu_setting_apply_deferred(void); int menu_setting_apply_deferred(rarch_setting_t *setting);
void menu_settings_apply_deferred(void);
int menu_setting_set_flags(rarch_setting_t *setting); int menu_setting_set_flags(rarch_setting_t *setting);

2
retroarch.c
View File

@ -1427,7 +1427,7 @@ void rarch_main_set_state(unsigned cmd)
break; break;
case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED: case RARCH_ACTION_STATE_MENU_RUNNING_FINISHED:
#ifdef HAVE_MENU #ifdef HAVE_MENU
menu_setting_apply_deferred(); menu_settings_apply_deferred();
menu_driver_toggle(false); menu_driver_toggle(false);
menu_driver_unset_alive(); menu_driver_unset_alive();