only disable states when hardcore mode is enabled

This commit is contained in:
radius 2017-11-26 13:39:39 -05:00
parent bc69737dae
commit 2dda04787a

View File

@ -1102,7 +1102,7 @@ static void command_event_load_auto_state(void)
#endif
#ifdef HAVE_CHEEVOS
if (settings->bools.cheevos_hardcore_mode_enable)
if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
goto error;
#endif
@ -1356,7 +1356,7 @@ static bool command_event_save_auto_state(void)
goto error;
#ifdef HAVE_CHEEVOS
if (settings->bools.cheevos_hardcore_mode_enable)
if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
goto error;
#endif
@ -1845,7 +1845,7 @@ bool command_event(enum event_command cmd, void *data)
#ifdef HAVE_CHEEVOS
{
settings_t *settings = config_get_ptr();
if (settings->bools.cheevos_hardcore_mode_enable)
if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
return false;
}
#endif
@ -1887,7 +1887,7 @@ bool command_event(enum event_command cmd, void *data)
{
settings_t *settings = config_get_ptr();
#ifdef HAVE_CHEEVOS
if (settings->bools.cheevos_hardcore_mode_enable)
if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
return false;
#endif
@ -1978,7 +1978,7 @@ bool command_event(enum event_command cmd, void *data)
{
#ifdef HAVE_CHEEVOS
settings_t *settings = config_get_ptr();
if (settings->bools.cheevos_hardcore_mode_enable)
if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
return false;
#endif
@ -1989,7 +1989,7 @@ bool command_event(enum event_command cmd, void *data)
{
settings_t *settings = config_get_ptr();
#ifdef HAVE_CHEEVOS
if (settings->bools.cheevos_hardcore_mode_enable)
if (cheevos_loaded && settings->bools.cheevos_hardcore_mode_enable)
return false;
#endif
if (settings->bools.rewind_enable)