mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

prevent occasional infinite wait loading multi-disc game from secondary disc (#13561)

Browse Source
This commit is contained in:
Jamiras 2022-01-31 11:28:31 -07:00 committed by GitHub
parent 6d5d2e722d
commit e301fffae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cheevos/cheevos.c
View File

@ -1741,6 +1741,7 @@ static bool rcheevos_identify_game(const struct retro_game_info* info)
if (iterator.consoles[iterator.index] == 0) if (iterator.consoles[iterator.index] == 0)
{ {
/* no more potential matches, just try the one hash */ /* no more potential matches, just try the one hash */
rcheevos_begin_load_state(RCHEEVOS_LOAD_STATE_IDENTIFYING_GAME);
rcheevos_client_identify_game(hash, rcheevos_client_identify_game(hash,
rcheevos_identify_game_callback, NULL); rcheevos_identify_game_callback, NULL);
return true; return true;
@ -1773,6 +1774,8 @@ static bool rcheevos_identify_game(const struct retro_game_info* info)
} }
memcpy(&data->iterator, &iterator, sizeof(iterator)); memcpy(&data->iterator, &iterator, sizeof(iterator));
rcheevos_begin_load_state(RCHEEVOS_LOAD_STATE_IDENTIFYING_GAME);
rcheevos_client_identify_game(hash, rcheevos_client_identify_game(hash,
rcheevos_identify_game_callback, data); rcheevos_identify_game_callback, data);
return true; return true;

1
cheevos/cheevos_client.c
View File

@ -746,7 +746,6 @@ void rcheevos_client_identify_game(const char* hash,
request->callback = callback; request->callback = callback;
request->callback_data = userdata; request->callback_data = userdata;
rcheevos_begin_load_state(RCHEEVOS_LOAD_STATE_IDENTIFYING_GAME);
rcheevos_async_begin_request(request, result, rcheevos_async_begin_request(request, result,
rcheevos_async_resolve_hash_callback, rcheevos_async_resolve_hash_callback,
CHEEVOS_ASYNC_RESOLVE_HASH, 0, CHEEVOS_ASYNC_RESOLVE_HASH, 0,