diff --git a/OpenRA.Mods.RA/NullLoadScreen.cs b/OpenRA.Mods.RA/NullLoadScreen.cs index ed1e179040..e49a0d8f78 100644 --- a/OpenRA.Mods.RA/NullLoadScreen.cs +++ b/OpenRA.Mods.RA/NullLoadScreen.cs @@ -14,6 +14,9 @@ namespace OpenRA.Mods.RA { public void Display() { + if (Game.Renderer == null) + return; + Game.Renderer.BeginFrame(float2.Zero); Game.Renderer.EndFrame(); } diff --git a/OpenRA.Mods.RA/RALoadScreen.cs b/OpenRA.Mods.RA/RALoadScreen.cs index 150039b6e2..5a49403813 100644 --- a/OpenRA.Mods.RA/RALoadScreen.cs +++ b/OpenRA.Mods.RA/RALoadScreen.cs @@ -18,12 +18,7 @@ using OpenRA.Widgets; namespace OpenRA.Mods.RA { public class RALoadScreen : ILoadScreen - { - public RALoadScreen () - { - - } - + { static string[] loadComments = new[] { "Filling Crates...", "Charging Capacitors...", "Reticulating Splines...", "Planting Trees...", "Building Bridges...", "Aging Empires...", "Compiling EVA...", "Constructing Pylons...", "Activating Skynet...", @@ -33,6 +28,9 @@ namespace OpenRA.Mods.RA static Stopwatch lastLoadScreen = new Stopwatch(); public void Display() { + if (Game.Renderer == null) + return; + // Update text at most every 0.5 seconds if (lastLoadScreen.ElapsedTime() < 0.5) return;