github/duckstation
1
0
Fork 0
mirror of https://github.com/stenzek/duckstation.git synced 2025-06-08 04:25:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

System: Fix possible race condition in presence update

Browse Source
This commit is contained in:
Stenzek 2024-09-02 12:12:41 +10:00
parent b564f928bd
commit 164a353352
No known key found for this signature in database
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/system.cpp
View File

@ -4551,7 +4551,7 @@ void System::WarnAboutUnsafeSettings()
if (g_settings.enable_8mb_ram) if (g_settings.enable_8mb_ram)
{ {
append(ICON_EMOJI_WARNING, append(ICON_EMOJI_WARNING,
TRANSLATE_SV("System", "8MB RAM is enabled, this may be incompatible with some games.")); TRANSLATE_SV("System", "8MB RAM is enabled, this may be incompatible with some games."));
} }
} }
else else
@ -5885,15 +5885,14 @@ void System::UpdateRichPresence(bool update_session_time)
} }
} }
const auto lock = Achievements::GetLock();
std::string state_string; std::string state_string;
if (Achievements::HasRichPresence()) if (Achievements::HasRichPresence())
{ rp.state = (state_string = StringUtil::Ellipsise(Achievements::GetRichPresenceString(), 128)).c_str();
const auto lock = Achievements::GetLock();
state_string = StringUtil::Ellipsise(Achievements::GetRichPresenceString(), 128); if (const std::string& icon_url = Achievements::GetGameIconURL(); !icon_url.empty())
rp.state = state_string.c_str(); rp.largeImageKey = icon_url.c_str();
if (const std::string& icon_url = Achievements::GetGameIconURL(); !icon_url.empty())
rp.largeImageKey = icon_url.c_str();
}
dyn_libs::Discord_UpdatePresence(&rp); dyn_libs::Discord_UpdatePresence(&rp);
} }