Merge pull request #13240 from Jamiras/cheevos_rewind

(cheevos) make sure loaded is set to true before re-enabling rewind
This commit is contained in:
Autechre 2021-11-15 19:25:24 +01:00 committed by GitHub
commit 369e175e60
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1337,6 +1337,15 @@ static void rcheevos_start_session(void)
&& rcheevos_locals.hardcore_active) && rcheevos_locals.hardcore_active)
rcheevos_activate_leaderboards(); rcheevos_activate_leaderboards();
/* We don't have to wait for this to complete
* to proceed to the next loading state */
rcheevos_client_start_session(rcheevos_locals.game.id);
rcheevos_validate_memrefs(&rcheevos_locals);
/* Let the runtime start processing the achievements */
rcheevos_locals.loaded = true;
#if HAVE_REWIND #if HAVE_REWIND
if (!rcheevos_locals.hardcore_active) if (!rcheevos_locals.hardcore_active)
{ {
@ -1360,15 +1369,6 @@ static void rcheevos_start_session(void)
} }
#endif #endif
/* We don't have to wait for this to complete
* to proceed to the next loading state */
rcheevos_client_start_session(rcheevos_locals.game.id);
rcheevos_validate_memrefs(&rcheevos_locals);
/* Let the runtime start processing the achievements */
rcheevos_locals.loaded = true;
rcheevos_show_game_placard(); rcheevos_show_game_placard();
if (rcheevos_end_load_state() == 0) if (rcheevos_end_load_state() == 0)