production stuff: fixes #54

OpenRa.Game/Sidebar.cs

@@ -163,7 +163,8 @@ namespace OpenRa.Game
 			if( mi.Button == MouseButtons.Left && mi.Event == MouseInputEvent.Down )
             {
 				string group = Rules.UnitCategory[ item.Tag ];
-					if (player.Producing(group) == null)
+				var producing = player.Producing(group);
+				if (producing == null)
 				{
 					var ui = Rules.UnitInfo[item.Tag];
 					var time = ui.Cost
@@ -171,8 +172,12 @@ namespace OpenRa.Game
 						* (25 * 60) /* frames per min */				/* todo: build acceleration, if we do that */
 						/ 1000;
 
-						player.BeginProduction( group, 
-							new ProductionItem( item.Tag, (int)time, ui.Cost ) );
+					player.BeginProduction(group,
+						new ProductionItem(item.Tag, (int)time, ui.Cost));
+					//Build(item);
+				}
+				else if (producing.Item == item.Tag)
+				{
 					Build(item);
 				}
             }

OpenRa.Game/UnitOrders.cs

@@ -62,6 +62,8 @@ namespace OpenRa.Game
 
 						Game.controller.orderGenerator = null;
 						Game.worldRenderer.uiOverlay.KillOverlay();
+
+						order.Player.FinishProduction(Rules.UnitCategory[building.Name]);
 					} );
 					break;
 				}