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

Properly handle overlay_enable changes.

Browse Source
This commit is contained in:
Themaister 2014-06-13 12:19:34 +02:00
parent a639d85aff
commit d7d1d9ff10
2 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
frontend/menu/backend/menu_common_backend.c
View File

@ -2472,9 +2472,14 @@ static int menu_common_iterate(unsigned action)
if (driver.overlay) if (driver.overlay)
input_overlay_free(driver.overlay); input_overlay_free(driver.overlay);
driver.overlay = input_overlay_new(g_settings.input.overlay); driver.overlay = NULL;
if (!driver.overlay)
RARCH_ERR("Failed to load overlay.\n"); if (g_settings.input.overlay_enable)
{
driver.overlay = input_overlay_new(g_settings.input.overlay);
if (!driver.overlay)
RARCH_ERR("Failed to load overlay.\n");
}
menu_flush_stack_type(MENU_SETTINGS_OPTIONS); menu_flush_stack_type(MENU_SETTINGS_OPTIONS);
} }
@ -3773,11 +3778,33 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
break; break;
#ifdef HAVE_OVERLAY #ifdef HAVE_OVERLAY
case MENU_SETTINGS_OVERLAY_ENABLE: case MENU_SETTINGS_OVERLAY_ENABLE:
if (action == MENU_ACTION_OK) {
bool changed = false;
if (action == MENU_ACTION_OK || action == MENU_ACTION_LEFT || action == MENU_ACTION_RIGHT)
{
g_settings.input.overlay_enable = !g_settings.input.overlay_enable; g_settings.input.overlay_enable = !g_settings.input.overlay_enable;
changed = true;
}
else if (action == MENU_ACTION_START) else if (action == MENU_ACTION_START)
{
g_settings.input.overlay_enable = g_defaults.settings.input_overlay_enable; g_settings.input.overlay_enable = g_defaults.settings.input_overlay_enable;
changed = true;
}
if (changed)
{
if (driver.overlay)
input_overlay_free(driver.overlay);
driver.overlay = NULL;
if (g_settings.input.overlay_enable && *g_settings.input.overlay)
{
driver.overlay = input_overlay_new(g_settings.input.overlay);
if (!driver.overlay)
RARCH_ERR("Failed to load overlay.\n");
}
}
break; break;
}
case MENU_SETTINGS_OVERLAY_PRESET: case MENU_SETTINGS_OVERLAY_PRESET:
switch (action) switch (action)
{ {
@ -4081,7 +4108,7 @@ static int menu_common_setting_set(unsigned setting, unsigned action)
break; break;
} }
case MENU_SETTINGS_DEVICE_AUTODETECT_ENABLE: case MENU_SETTINGS_DEVICE_AUTODETECT_ENABLE:
if (action == MENU_ACTION_OK) if (action == MENU_ACTION_OK || action == MENU_ACTION_LEFT || action == MENU_ACTION_RIGHT)
g_settings.input.autodetect_enable = !g_settings.input.autodetect_enable; g_settings.input.autodetect_enable = !g_settings.input.autodetect_enable;
break; break;
case MENU_SETTINGS_CUSTOM_BIND_MODE: case MENU_SETTINGS_CUSTOM_BIND_MODE:

2
settings.c
View File

@ -390,8 +390,6 @@ void config_set_defaults(void)
g_settings.input.turbo_period = turbo_period; g_settings.input.turbo_period = turbo_period;
g_settings.input.turbo_duty_cycle = turbo_duty_cycle; g_settings.input.turbo_duty_cycle = turbo_duty_cycle;
g_settings.input.overlay_enable = false;
g_settings.input.overlay_enable = g_defaults.settings.input_overlay_enable; g_settings.input.overlay_enable = g_defaults.settings.input_overlay_enable;
g_settings.input.overlay_opacity = 0.7f; g_settings.input.overlay_opacity = 0.7f;