Fix OrderManager being deleted in map editor
This commit is contained in:
committed by
Matthias Mailänder
parent
b070c0818f
commit
ab6dc5db32
@@ -543,6 +543,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
|||||||
|
|
||||||
if (map.Visibility == MapVisibility.Lobby)
|
if (map.Visibility == MapVisibility.Lobby)
|
||||||
{
|
{
|
||||||
|
// HACK: Server lobby should be usable without a server.
|
||||||
ConnectionLogic.Connect(Game.CreateLocalServer(uid),
|
ConnectionLogic.Connect(Game.CreateLocalServer(uid),
|
||||||
"",
|
"",
|
||||||
() => Game.OpenWindow("SERVER_LOBBY", new WidgetArgs
|
() => Game.OpenWindow("SERVER_LOBBY", new WidgetArgs
|
||||||
|
|||||||
@@ -473,7 +473,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
|||||||
SwitchMenu(MenuType.None);
|
SwitchMenu(MenuType.None);
|
||||||
Game.OpenWindow("MISSIONBROWSER_PANEL", new WidgetArgs
|
Game.OpenWindow("MISSIONBROWSER_PANEL", new WidgetArgs
|
||||||
{
|
{
|
||||||
{ "onExit", () => SwitchMenu(MenuType.Singleplayer) },
|
{ "onExit", () => { Game.Disconnect(); SwitchMenu(MenuType.Singleplayer); } },
|
||||||
{ "onStart", () => { RemoveShellmapUI(); lastGameState = MenuPanel.Missions; } },
|
{ "onStart", () => { RemoveShellmapUI(); lastGameState = MenuPanel.Missions; } },
|
||||||
{ "initialMap", map }
|
{ "initialMap", map }
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -199,7 +199,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
|
|||||||
widget.Get<ButtonWidget>("BACK_BUTTON").OnClick = () =>
|
widget.Get<ButtonWidget>("BACK_BUTTON").OnClick = () =>
|
||||||
{
|
{
|
||||||
StopVideo(videoPlayer);
|
StopVideo(videoPlayer);
|
||||||
Game.Disconnect();
|
|
||||||
Ui.CloseWindow();
|
Ui.CloseWindow();
|
||||||
onExit();
|
onExit();
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user