summaryrefslogtreecommitdiff
path: root/src/SMAPI/Framework/ContentManagers
diff options
context:
space:
mode:
authorJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2022-05-24 18:12:06 -0400
committerJesse Plamondon-Willard <Pathoschild@users.noreply.github.com>2022-05-24 18:12:06 -0400
commit064346594d2239b1dceb9ddbc78e147c555d63d7 (patch)
tree431241d1536fe267a431c3d23843744311111212 /src/SMAPI/Framework/ContentManagers
parent5083b65c8708b0c5c0a12871d2fdda830bb98f09 (diff)
downloadSMAPI-064346594d2239b1dceb9ddbc78e147c555d63d7.tar.gz
SMAPI-064346594d2239b1dceb9ddbc78e147c555d63d7.tar.bz2
SMAPI-064346594d2239b1dceb9ddbc78e147c555d63d7.zip
fix split-screen error when a mod provides a localized asset in one screen but not another
Diffstat (limited to 'src/SMAPI/Framework/ContentManagers')
-rw-r--r--src/SMAPI/Framework/ContentManagers/BaseContentManager.cs12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
index ddc02a8c..d7be0c37 100644
--- a/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
+++ b/src/SMAPI/Framework/ContentManagers/BaseContentManager.cs
@@ -153,7 +153,9 @@ namespace StardewModdingAPI.Framework.ContentManagers
return this.LoadExact<T>(assetName, useCache: useCache);
// check for localized asset
- if (!LocalizedContentManager.localizedAssetNames.TryGetValue(assetName.Name, out _))
+ // ReSharper disable once LocalVariableHidesMember -- this is deliberate
+ Dictionary<string, string> localizedAssetNames = this.Coordinator.LocalizedAssetNames.Value;
+ if (!localizedAssetNames.TryGetValue(assetName.Name, out _))
{
string localeCode = this.LanguageCodeString(language);
IAssetName localizedName = new AssetName(baseName: assetName.BaseName, localeCode: localeCode, languageCode: language);
@@ -161,7 +163,7 @@ namespace StardewModdingAPI.Framework.ContentManagers
try
{
T data = this.LoadExact<T>(localizedName, useCache: useCache);
- LocalizedContentManager.localizedAssetNames[assetName.Name] = localizedName.Name;
+ localizedAssetNames[assetName.Name] = localizedName.Name;
return data;
}
catch (ContentLoadException)
@@ -170,18 +172,18 @@ namespace StardewModdingAPI.Framework.ContentManagers
try
{
T data = this.LoadExact<T>(localizedName, useCache: useCache);
- LocalizedContentManager.localizedAssetNames[assetName.Name] = localizedName.Name;
+ localizedAssetNames[assetName.Name] = localizedName.Name;
return data;
}
catch (ContentLoadException)
{
- LocalizedContentManager.localizedAssetNames[assetName.Name] = assetName.Name;
+ localizedAssetNames[assetName.Name] = assetName.Name;
}
}
}
// use cached key
- string rawName = LocalizedContentManager.localizedAssetNames[assetName.Name];
+ string rawName = localizedAssetNames[assetName.Name];
if (assetName.Name != rawName)
assetName = this.Coordinator.ParseAssetName(rawName, allowLocales: this.TryLocalizeKeys);
return this.LoadExact<T>(assetName, useCache: useCache);