Merge pull request #7522 from delftswa2014/bugfix/sellicon

Closes #7508
OpenRA · Mar 8, 2015 · 762c0e1 · 762c0e1
2 parents 78e74eb + 97ca96f
commit 762c0e1
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs b/OpenRA.Mods.Common/Orders/GlobalButtonOrderGenerator.cs
@@ -43,8 +43,14 @@ IEnumerable<Order> OrderInner(World world, MouseInput mi)
 					.FirstOrDefault(a => a.Owner == world.LocalPlayer && a.TraitsImplementing<T>()
 						.Any(Exts.IsTraitEnabled));
 
-				if (underCursor != null)
-					yield return new Order(order, underCursor, false);
+				if (underCursor == null)
+					yield break;
+
+				var building = underCursor.TraitOrDefault<Building>();
+				if (building != null && building.Locked)
+					yield break;
+
+				yield return new Order(order, underCursor, false);
 			}
 		}