From b58988c6236c134f532f6229b5810e58b77dc1f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 13 Jun 2015 11:01:55 +0200 Subject: [PATCH] move the null check to avoid a crash --- OpenRA.Game/Settings.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/OpenRA.Game/Settings.cs b/OpenRA.Game/Settings.cs index 05962a886c..d42f88e835 100644 --- a/OpenRA.Game/Settings.cs +++ b/OpenRA.Game/Settings.cs @@ -334,13 +334,13 @@ namespace OpenRA var clean = SanitizedName(dirty); + if (string.IsNullOrWhiteSpace(clean) || forbiddenNames.Contains(clean) || botNames.Contains(clean)) + clean = new PlayerSettings().Name; + // avoid UI glitches if (clean.Length > 16) clean = clean.Substring(0, 16); - if (string.IsNullOrWhiteSpace(clean) || forbiddenNames.Contains(clean) || botNames.Contains(clean)) - clean = new PlayerSettings().Name; - return clean; }