Skip to content

Use correct language when propagating textures #990

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SinZ163 wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Use correct language when propagating textures #990

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3df4d9a
Use correct language when propagating textures
SinZ163 Sep 15, 2025
4d4a3c4
Be consistent with cache reads vs fresh load
SinZ163 Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/SMAPI/Metadata/CoreAssetPropagator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ private bool PropagateTexture(IAssetName assetName, LocalizedContentManager.Lang
Lazy<Texture2D>[] newTextures = new Lazy<Texture2D>[assetNames.Length];
newTextures[0] = new Lazy<Texture2D>(() => this.DisposableContentManager.LoadLocalized<Texture2D>(assetName, language, useCache: false));
if (assetNames.Length > 1)
newTextures[1] = new Lazy<Texture2D>(() => this.DisposableContentManager.LoadLocalized<Texture2D>(assetNames[1], language, useCache: false));
newTextures[1] = new Lazy<Texture2D>(() => this.DisposableContentManager.LoadLocalized<Texture2D>(assetNames[1], assetNames[1].LanguageCode ?? this.DisposableContentManager.Language, useCache: false));

// apply to content managers
foreach (IContentManager contentManager in contentManagers)
Expand All @@ -178,7 +178,7 @@ private bool PropagateTexture(IAssetName assetName, LocalizedContentManager.Lang
{
changed = true;

Texture2D texture = contentManager.LoadLocalized<Texture2D>(name, language, useCache: true);
Texture2D texture = contentManager.LoadLocalized<Texture2D>(name, name.LanguageCode ?? contentManager.Language, useCache: true);
texture.CopyFromTexture(newTextures[i].Value);
}
else
Expand Down