github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-06 19:45:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Achievements: Unload RAIntegration on UI thread

Browse Source 
Fixes crash when toggling it on/off.
This commit is contained in:
Stenzek 2025-05-09 20:56:43 +10:00
parent 303ad7cdce
commit aee66edd6e
No known key found for this signature in database
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/achievements.cpp
View File

@ -858,7 +858,10 @@ void Achievements::Shutdown()
#ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION #ifdef RC_CLIENT_SUPPORTS_RAINTEGRATION
if (s_state.using_raintegration) if (s_state.using_raintegration)
{
UnloadRAIntegration(); UnloadRAIntegration();
return;
}
#endif #endif
DestroyClient(&s_state.client, &s_state.http_downloader); DestroyClient(&s_state.client, &s_state.http_downloader);
@ -4744,8 +4747,7 @@ void Achievements::FinishLoadRAIntegrationOnCPUThread()
void Achievements::UnloadRAIntegration() void Achievements::UnloadRAIntegration()
{ {
if (!s_state.using_raintegration) DebugAssert(s_state.using_raintegration && s_state.client);
return;
if (s_state.load_raintegration_request) if (s_state.load_raintegration_request)
{ {
@ -4753,9 +4755,16 @@ void Achievements::UnloadRAIntegration()
s_state.load_raintegration_request = nullptr; s_state.load_raintegration_request = nullptr;
} }
rc_client_unload_raintegration(s_state.client); // Have to unload it on the UI thread, otherwise the DLL unload races the UI thread message processing.
s_state.http_downloader->WaitForAllRequests();
s_state.http_downloader.reset();
s_state.raintegration_loading = false; s_state.raintegration_loading = false;
s_state.using_raintegration = false; s_state.using_raintegration = false;
Host::RunOnUIThread([client = std::exchange(s_state.client, nullptr)]() {
rc_client_unload_raintegration(client);
rc_client_destroy(client);
});
Host::OnRAIntegrationMenuChanged(); Host::OnRAIntegrationMenuChanged();
} }