Mirror/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-10-01 14:58:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21998 from hrydgard/retroachievements-crashfix

Browse Source 
RetroAchievements: Avoid crashing when drawing achievements without images
This commit is contained in:
Henrik Rydgård authored and GitHub committed 2026-07-29 00:03:30 +02:00
2 parents 7b380415e0 62938ceef7
commit 08589f48ef
1 file changed
+12 -8
Download Patch File Download Diff File Expand all files Collapse all files
UI/RetroAchievementScreens.cpp
+12 -8
View File
@@ -620,10 +620,12 @@ void RenderAchievement(UIContext &dc, const rc_client_achievement_t *achievement
// Download and display the image.
const char *url = iconState == RC_CLIENT_ACHIEVEMENT_STATE_UNLOCKED ? achievement->badge_url : achievement->badge_locked_url;
std::string imageUrl = http::RemoveHttpsIfNeeded(url);
Achievements::DownloadImageIfMissing(imageUrl);
if (g_iconCache.BindIconTexture(&dc, imageUrl)) {
dc.Draw()->DrawTexRect(Bounds(bounds.x + padding, bounds.y + padding, iconSpace, iconSpace), 0.0f, 0.0f, 1.0f, 1.0f, whiteAlpha(alpha));
if (url && strlen(url) > 0) {
std::string imageUrl = http::RemoveHttpsIfNeeded(url);
Achievements::DownloadImageIfMissing(imageUrl);
if (g_iconCache.BindIconTexture(&dc, imageUrl)) {
dc.Draw()->DrawTexRect(Bounds(bounds.x + padding, bounds.y + padding, iconSpace, iconSpace), 0.0f, 0.0f, 1.0f, 1.0f, whiteAlpha(alpha));
}
}
dc.SetFontStyle(*GetTextStyle(dc, UI::TextSize::Normal));
dc.Flush();
@@ -670,11 +672,13 @@ static void RenderGameAchievementSummary(UIContext &dc, const Bounds &bounds, fl
dc.SetFontStyle(dc.GetTheme().uiFont);
dc.Flush();
std::string imageUrl = http::RemoveHttpsIfNeeded(gameInfo->badge_url);
if (gameInfo->badge_url && strlen(gameInfo->badge_url) > 0) {
std::string imageUrl = http::RemoveHttpsIfNeeded(gameInfo->badge_url);
Achievements::DownloadImageIfMissing(imageUrl);
if (g_iconCache.BindIconTexture(&dc, imageUrl)) {
dc.Draw()->DrawTexRect(Bounds(bounds.x, bounds.y + (bounds.h - iconSpace) * 0.5f, iconSpace, iconSpace), 0.0f, 0.0f, 1.0f, 1.0f, whiteAlpha(alpha));
Achievements::DownloadImageIfMissing(imageUrl);
if (g_iconCache.BindIconTexture(&dc, imageUrl)) {
dc.Draw()->DrawTexRect(Bounds(bounds.x, bounds.y + (bounds.h - iconSpace) * 0.5f, iconSpace, iconSpace), 0.0f, 0.0f, 1.0f, 1.0f, whiteAlpha(alpha));
}
}
dc.Flush();