Merge pull request #9739 from Jamiras/cheevos_init_load_state

(cheevos) prevent loading state while achievements are still being fetched from server
This commit is contained in:
Twinaphex 2019-11-17 23:16:21 +01:00 committed by GitHub
commit 9c0028c1d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions

View File

@ -1571,6 +1571,7 @@ static int rcheevos_iterate(rcheevos_coro_t* coro)
}
CHEEVOS_LOG(RCHEEVOS_TAG "this game doesn't feature achievements\n");
rcheevos_hardcore_paused = true;
CORO_STOP();
found:
@ -1624,6 +1625,8 @@ found:
"This game has no achievements.",
0, 5 * 60, false, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
rcheevos_hardcore_paused = true;
CORO_STOP();
}

View File

@ -27077,7 +27077,7 @@ static enum runloop_state runloop_check_state(void)
#ifdef HAVE_CHEEVOS
rcheevos_hardcore_active = settings->bools.cheevos_enable
&& settings->bools.cheevos_hardcore_mode_enable
&& rcheevos_loaded && !rcheevos_hardcore_paused;
&& !rcheevos_hardcore_paused;
if (rcheevos_hardcore_active && rcheevos_state_loaded_flag)
{