From 220473bf742a9e12231d5d55cdd49f515fc8c62f Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Tue, 26 Jun 2012 11:31:13 +1200
Subject: [PATCH] remove duplication in UOG

---
 OpenRA.Game/Orders/UnitOrderGenerator.cs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenRA.Game/Orders/UnitOrderGenerator.cs b/OpenRA.Game/Orders/UnitOrderGenerator.cs
index a1717319b1..98b0e97719 100644
--- a/OpenRA.Game/Orders/UnitOrderGenerator.cs
+++ b/OpenRA.Game/Orders/UnitOrderGenerator.cs
@@ -63,9 +63,8 @@ namespace OpenRA.Orders
 				.Where(o => o != null)
 				.ToArray();
 
-			if( orders.Length == 0 ) return (useSelect) ? "select" : "default";
-
-			return orders[0].cursor ?? ((useSelect) ? "select" : "default");
+			var cursorName = orders.Select(o => o.cursor).FirstOrDefault();
+			return cursorName ?? (useSelect ? "select" : "default");
 		}
 
 		static UnitOrderResult OrderForUnit(Actor self, CPos xy, MouseInput mi, Actor underCursor)