epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8420 from Mailaender/unitordergen-nre

Browse Source 
Fixed a dereference after null check in UnitOrderGenerator.CheckSameOrder
This commit is contained in:
Pavel Penev
2015-06-08 01:06:49 +03:00
parent ce1eed6bcc 8381fbd712
commit 21f0d5c5a0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenRA.Game/Orders/UnitOrderGenerator.cs
View File

@@ -140,7 +140,7 @@ namespace OpenRA.Orders
{
if (order == null && iot.OrderID != null)
Game.Debug("BUG: in order targeter - decided on {0} but then didn't order", iot.OrderID);
else if (iot.OrderID != order.OrderString)
else if (order != null && iot.OrderID != order.OrderString)
Game.Debug("BUG: in order targeter - decided on {0} but ordered {1}", iot.OrderID, order.OrderString);
return order;
}