From 50693bfc20587a55df6d64af9611daa214240464 Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Wed, 11 Mar 2026 18:20:13 +1100
Subject: [PATCH] Use unique thumbnail callback thunks in UI scenes

---
 .../Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp | 6 +++---
 Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp    | 6 +++---
 .../Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp           | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp
index dd30006c1..6ffc1903c 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_InGameSaveManagementMenu.cpp
@@ -8,7 +8,7 @@
 
 namespace
 {
-int LoadSaveDataThumbnailReturnedThunk(void *lpParam, std::uint8_t *thumbnailData, unsigned int thumbnailBytes)
+int InGameSaveManagementThumbnailReturnedThunk(void *lpParam, std::uint8_t *thumbnailData, unsigned int thumbnailBytes)
 {
 	return UIScene_InGameSaveManagementMenu::LoadSaveDataThumbnailReturned(lpParam, thumbnailData, thumbnailBytes);
 }
@@ -266,7 +266,7 @@ void UIScene_InGameSaveManagementMenu::tick()
 				app.DebugPrintf("Requesting the first thumbnail\n");
 				// set the save to load
 				PSAVE_DETAILS pSaveDetails=StorageManager.ReturnSavesInfo();
-				C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iRequestingThumbnailId],&LoadSaveDataThumbnailReturnedThunk,this);
+				C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iRequestingThumbnailId],&InGameSaveManagementThumbnailReturnedThunk,this);
 
 				if(eLoadStatus!=C4JStorage::ESaveGame_GetSaveThumbnail)
 				{
@@ -331,7 +331,7 @@ void UIScene_InGameSaveManagementMenu::tick()
 					app.DebugPrintf("Requesting another thumbnail\n");
 					// set the save to load
 					PSAVE_DETAILS pSaveDetails=StorageManager.ReturnSavesInfo();
-					C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iRequestingThumbnailId],&LoadSaveDataThumbnailReturnedThunk,this);
+					C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iRequestingThumbnailId],&InGameSaveManagementThumbnailReturnedThunk,this);
 					if(eLoadStatus!=C4JStorage::ESaveGame_GetSaveThumbnail)
 					{
 						// something went wrong
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp
index 9900ef8c5..c231e047c 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadMenu.cpp
@@ -25,7 +25,7 @@
 
 namespace
 {
-int LoadSaveDataThumbnailReturnedThunk(void *lpParam, std::uint8_t *thumbnailData, unsigned int thumbnailBytes)
+int LoadMenuThumbnailReturnedThunk(void *lpParam, std::uint8_t *thumbnailData, unsigned int thumbnailBytes)
 {
 	return UIScene_LoadMenu::LoadSaveDataThumbnailReturned(lpParam, thumbnailData, thumbnailBytes);
 }
@@ -233,9 +233,9 @@ UIScene_LoadMenu::UIScene_LoadMenu(int iPad, void *initData, UILayer *parentLaye
 #ifdef _DURANGO
 			// On Durango, we have an extra flag possible with LoadSaveDataThumbnail, which if true will force the loading of this thumbnail even if the save data isn't sync'd from
 			// the cloud at this stage. This could mean that there could be a pretty large delay before the callback happens, in this case.
-			C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iSaveGameInfoIndex],&LoadSaveDataThumbnailReturnedThunk,this,true);
+			C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iSaveGameInfoIndex],&LoadMenuThumbnailReturnedThunk,this,true);
 #else
-			C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iSaveGameInfoIndex],&LoadSaveDataThumbnailReturnedThunk,this);
+			C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iSaveGameInfoIndex],&LoadMenuThumbnailReturnedThunk,this);
 #endif
 			m_bShowTimer = true;
 		}
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
index eddede221..a5cea82fb 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -54,7 +54,7 @@ C4JStorage::SAVETRANSFER_FILE_DETAILS UIScene_LoadOrJoinMenu::m_debugTransferDet
 
 namespace
 {
-int LoadSaveDataThumbnailReturnedThunk(void *lpParam, std::uint8_t *thumbnailData, unsigned int thumbnailBytes)
+int LoadOrJoinThumbnailReturnedThunk(void *lpParam, std::uint8_t *thumbnailData, unsigned int thumbnailBytes)
 {
 	return UIScene_LoadOrJoinMenu::LoadSaveDataThumbnailReturned(lpParam, thumbnailData, thumbnailBytes);
 }
@@ -648,7 +648,7 @@ void UIScene_LoadOrJoinMenu::tick()
                 app.DebugPrintf("Requesting the first thumbnail\n");
                 // set the save to load
                 PSAVE_DETAILS pSaveDetails=StorageManager.ReturnSavesInfo();
-                C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iRequestingThumbnailId],&LoadSaveDataThumbnailReturnedThunk,this);
+                C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iRequestingThumbnailId],&LoadOrJoinThumbnailReturnedThunk,this);
 
                 if(eLoadStatus!=C4JStorage::ESaveGame_GetSaveThumbnail)
                 {
@@ -711,7 +711,7 @@ void UIScene_LoadOrJoinMenu::tick()
                     app.DebugPrintf("Requesting another thumbnail\n");
                     // set the save to load
                     PSAVE_DETAILS pSaveDetails=StorageManager.ReturnSavesInfo();
-                    C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iRequestingThumbnailId],&LoadSaveDataThumbnailReturnedThunk,this);
+                    C4JStorage::ESaveGameState eLoadStatus=StorageManager.LoadSaveDataThumbnail(&pSaveDetails->SaveInfoA[(int)m_iRequestingThumbnailId],&LoadOrJoinThumbnailReturnedThunk,this);
                     if(eLoadStatus!=C4JStorage::ESaveGame_GetSaveThumbnail)
                     {
                         // something went wrong