From 0816251bcd06ba09a604c655fa613c003e76a033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 13 Jun 2015 10:52:23 +0200 Subject: [PATCH] fix a null reference exception in parentKey --- .../UtilityCommands/UpgradeRules.cs | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs index 34b722971a..27661e6e36 100644 --- a/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs +++ b/OpenRA.Mods.Common/UtilityCommands/UpgradeRules.cs @@ -369,13 +369,16 @@ namespace OpenRA.Mods.Common.UtilityCommands // GiveUnitCrateAction and GiveMcvCrateAction were updated to allow multiple units if (engineVersion < 20140723) { - if (depth == 2 && parentKey.Contains("GiveMcvCrateAction")) - if (node.Key == "Unit") - node.Key = "Units"; + if (depth == 2 && !string.IsNullOrEmpty(parentKey)) + { + if (parentKey.Contains("GiveMcvCrateAction")) + if (node.Key == "Unit") + node.Key = "Units"; - if (depth == 2 && parentKey.Contains("GiveUnitCrateAction")) - if (node.Key == "Unit") - node.Key = "Units"; + if (parentKey.Contains("GiveUnitCrateAction")) + if (node.Key == "Unit") + node.Key = "Units"; + } } // Power from Building was moved out into Power and ScalePowerWithHealth traits