[GEN][ZH] Fix dereferencing NULL pointer 'CBScheme->m_buttonQueueImage' in ControlBarSchemeManager::preloadAssets() (#1126)

xezon · web-flow · commit 80e8b23eea8f · 2025-06-21T11:19:39.000+02:00
diff --git a/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/Generals/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
@@ -991,7 +991,7 @@ void ControlBarSchemeManager::preloadAssets( TimeOfDay timeOfDay )
 
 		if (CBScheme->m_rightHUDImage)
 		{
-			TheDisplay->preloadTextureAssets(CBScheme->m_buttonQueueImage->getFilename());
+			TheDisplay->preloadTextureAssets(CBScheme->m_rightHUDImage->getFilename());
 		}
 
 		for (Int layer = 0; layer < MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS; ++layer)
diff --git a/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp b/GeneralsMD/Code/GameEngine/Source/GameClient/GUI/ControlBar/ControlBarScheme.cpp
@@ -1004,7 +1004,7 @@ void ControlBarSchemeManager::preloadAssets( TimeOfDay timeOfDay )
 
 		if (CBScheme->m_rightHUDImage)
 		{
-			TheDisplay->preloadTextureAssets(CBScheme->m_buttonQueueImage->getFilename());
+			TheDisplay->preloadTextureAssets(CBScheme->m_rightHUDImage->getFilename());
 		}
 
 		for (Int layer = 0; layer < MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS; ++layer)

Original file line number	Diff line number	Diff line change
`@@ -991,7 +991,7 @@ void ControlBarSchemeManager::preloadAssets( TimeOfDay timeOfDay )`
`991`	`991`
`992`	`992`	`if (CBScheme->m_rightHUDImage)`
`993`	`993`	`{`
`994`		`- TheDisplay->preloadTextureAssets(CBScheme->m_buttonQueueImage->getFilename());`
	`994`	`+ TheDisplay->preloadTextureAssets(CBScheme->m_rightHUDImage->getFilename());`
`995`	`995`	`}`
`996`	`996`
`997`	`997`	`for (Int layer = 0; layer < MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS; ++layer)`
Original file line number	Diff line number	Diff line change
`@@ -1004,7 +1004,7 @@ void ControlBarSchemeManager::preloadAssets( TimeOfDay timeOfDay )`
`1004`	`1004`
`1005`	`1005`	`if (CBScheme->m_rightHUDImage)`
`1006`	`1006`	`{`
`1007`		`- TheDisplay->preloadTextureAssets(CBScheme->m_buttonQueueImage->getFilename());`
	`1007`	`+ TheDisplay->preloadTextureAssets(CBScheme->m_rightHUDImage->getFilename());`
`1008`	`1008`	`}`
`1009`	`1009`
`1010`	`1010`	`for (Int layer = 0; layer < MAX_CONTROL_BAR_SCHEME_IMAGE_LAYERS; ++layer)`