From c6ab4be268ea487d301fa998da0e49f8c3df107e Mon Sep 17 00:00:00 2001
From: Chris Forbes <chrisf@ijw.co.nz>
Date: Wed, 5 May 2010 20:56:21 +1200
Subject: [PATCH] #153 mouse cursor issues in vicinity of trees

---
 OpenRA.Game/Actor.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/OpenRA.Game/Actor.cs b/OpenRA.Game/Actor.cs
index 329e24aad3..3a7a67a370 100755
--- a/OpenRA.Game/Actor.cs
+++ b/OpenRA.Game/Actor.cs
@@ -123,12 +123,10 @@ namespace OpenRA
 
 			if (!World.Map.IsInMap(xy.X, xy.Y))
 				return null;
+
+			var underCursor = World.FindUnitsAtMouse(mi.Location)
+				.FirstOrDefault(a => a.traits.Contains<Selectable>());
 			
-			var underCursor = World.FindUnitsAtMouse(mi.Location).FirstOrDefault();
-
-			if (underCursor != null && !underCursor.traits.Contains<Selectable>())
-				underCursor = null;
-
 			return traits.WithInterface<IIssueOrder>()
 				.Select( x => x.IssueOrder( this, xy, mi, underCursor ) )
 				.FirstOrDefault( x => x != null );