From ba1d48fb6ab3e1d75d662b6ae422bbe66e671364 Mon Sep 17 00:00:00 2001 From: Jamiras Date: Sun, 28 Feb 2021 13:07:24 -0700 Subject: [PATCH] ensure hardcore remains disabled through load process --- tasks/task_save.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tasks/task_save.c b/tasks/task_save.c index 0cd758ecc1..7086bf0f1a 100644 --- a/tasks/task_save.c +++ b/tasks/task_save.c @@ -954,6 +954,11 @@ static void task_load_handler(retro_task_t *task) goto error; } +#ifdef HAVE_CHEEVOS + if (rcheevos_hardcore_active()) + task_set_cancelled(task, true); +#endif + remaining = MIN(state->size - state->bytes_read, SAVE_STATE_CHUNK); bytes_read = intfstream_read(state->file, (uint8_t*)state->data + state->bytes_read, remaining); @@ -1133,6 +1138,11 @@ static void content_load_state_cb(retro_task_t *task, settings_t *settings = config_get_ptr(); bool block_sram_overwrite = settings->bools.block_sram_overwrite; +#ifdef HAVE_CHEEVOS + if (rcheevos_hardcore_active()) + goto error; +#endif + RARCH_LOG("[State]: %s \"%s\", %u %s.\n", msg_hash_to_str(MSG_LOADING_STATE), load_data->path,