From 9d559fa7144c619bba9a50ff6f24d8091f105237 Mon Sep 17 00:00:00 2001 From: Maik Macho Date: Fri, 27 Oct 2017 00:29:34 +0200 Subject: [PATCH] Fix NRE - I assumed GetEnvironmentVariable returns "", not null --- src/Helper/XnaToFnaHelper.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Helper/XnaToFnaHelper.cs b/src/Helper/XnaToFnaHelper.cs index 0ef8079..af3825e 100644 --- a/src/Helper/XnaToFnaHelper.cs +++ b/src/Helper/XnaToFnaHelper.cs @@ -73,12 +73,12 @@ public static void ApplyChanges(GraphicsDeviceManager self) { self.IsFullScreen = true; int forceWidth; - if (int.TryParse(Environment.GetEnvironmentVariable("XNATOFNA_DISPLAY_WIDTH"), out forceWidth)) + if (int.TryParse(Environment.GetEnvironmentVariable("XNATOFNA_DISPLAY_WIDTH") ?? "", out forceWidth)) self.PreferredBackBufferWidth = forceWidth; int forceHeight; - if (int.TryParse(Environment.GetEnvironmentVariable("XNATOFNA_DISPLAY_HEIGHT"), out forceHeight)) + if (int.TryParse(Environment.GetEnvironmentVariable("XNATOFNA_DISPLAY_HEIGHT") ?? "", out forceHeight)) self.PreferredBackBufferHeight = forceHeight; - string[] forceSize = Environment.GetEnvironmentVariable("XNATOFNA_DISPLAY_SIZE").Split('x'); + string[] forceSize = (Environment.GetEnvironmentVariable("XNATOFNA_DISPLAY_SIZE") ?? "").Split('x'); if (forceSize.Length == 2) { if (int.TryParse(forceSize[0], out forceWidth)) self.PreferredBackBufferWidth = forceWidth;