diff --git a/OpenRA.Mods.Cnc/CncLoadScreen.cs b/OpenRA.Mods.Cnc/CncLoadScreen.cs index 063689821a..506fbd31d9 100644 --- a/OpenRA.Mods.Cnc/CncLoadScreen.cs +++ b/OpenRA.Mods.Cnc/CncLoadScreen.cs @@ -73,7 +73,7 @@ namespace OpenRA.Mods.Cnc versionText = modData.Manifest.Metadata.Version; } - bool setup; + object rendererFonts; SpriteFont loadingFont, versionFont; string loadingText, versionText; float2 loadingPos, versionPos; @@ -97,8 +97,10 @@ namespace OpenRA.Mods.Cnc null); var barY = bounds.Height - 78; - if (!setup && r.Fonts != null) + // The fonts dictionary may change when switching between the mod and content installer + if (r.Fonts != rendererFonts) { + rendererFonts = r.Fonts; loadingFont = r.Fonts["BigBold"]; loadingText = loadInfo["Text"]; loadingPos = new float2((bounds.Width - loadingFont.Measure(loadingText).X) / 2, barY); @@ -106,8 +108,6 @@ namespace OpenRA.Mods.Cnc versionFont = r.Fonts["Regular"]; var versionSize = versionFont.Measure(versionText); versionPos = new float2(bounds.Width - 107 - versionSize.X / 2, 115 - versionSize.Y / 2); - - setup = true; } if (loadingFont != null)