Merge pull request #11370 from pchote/fix-game-start-events

Fix shellmap UI disappearing prematurely when starting a mission or replay.
This commit is contained in:
reaperrr
2016-06-04 15:41:35 +02:00
4 changed files with 63 additions and 27 deletions

View File

@@ -197,7 +197,7 @@ namespace OpenRA
CreateAndStartLocalServer(lobbyInfo.GlobalSettings.Map, orders);
}
public static void CreateAndStartLocalServer(string mapUID, IEnumerable<Order> setupOrders, Action onStart = null)
public static void CreateAndStartLocalServer(string mapUID, IEnumerable<Order> setupOrders)
{
OrderManager om = null;
@@ -207,10 +207,8 @@ namespace OpenRA
LobbyInfoChanged -= lobbyReady;
foreach (var o in setupOrders)
om.IssueOrder(o);
if (onStart != null)
onStart();
};
LobbyInfoChanged += lobbyReady;
om = JoinServer(IPAddress.Loopback.ToString(), CreateLocalServer(mapUID), "");