epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix NRE when leaving game through menu after observing

Browse Source
This commit is contained in:
Scott_NZ
2013-04-21 21:29:50 +12:00
parent ca80ac2d1f
commit 3ce68d2f7d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.RA/Widgets/Logic/IngameMenuLogic.cs
View File

@@ -21,7 +21,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
widget.Get<ButtonWidget>("DISCONNECT").OnClick = () => widget.Get<ButtonWidget>("DISCONNECT").OnClick = () =>
{ {
onExit(); onExit();
LeaveGame(widget, world, onExit); LeaveGame(world);
}; };
widget.Get<ButtonWidget>("SETTINGS").OnClick = () => Ui.OpenWindow("SETTINGS_MENU"); widget.Get<ButtonWidget>("SETTINGS").OnClick = () => Ui.OpenWindow("SETTINGS_MENU");
widget.Get<ButtonWidget>("MUSIC").OnClick = () => Ui.OpenWindow("MUSIC_MENU"); widget.Get<ButtonWidget>("MUSIC").OnClick = () => Ui.OpenWindow("MUSIC_MENU");
@@ -35,9 +35,9 @@ namespace OpenRA.Mods.RA.Widgets.Logic
widget.Get("SURRENDER").IsVisible = () => world.LocalPlayer != null && world.LocalPlayer.WinState == WinState.Undefined; widget.Get("SURRENDER").IsVisible = () => world.LocalPlayer != null && world.LocalPlayer.WinState == WinState.Undefined;
} }
void LeaveGame(Widget widget, World world, Action onExit) void LeaveGame(World world)
{ {
Sound.PlayNotification(null, "Speech", "Leave", world.LocalPlayer.Country.Race); Sound.PlayNotification(null, "Speech", "Leave", world.LocalPlayer == null ? null : world.LocalPlayer.Country.Race);
Game.Disconnect(); Game.Disconnect();
Ui.CloseWindow(); Ui.CloseWindow();
Game.LoadShellMap(); Game.LoadShellMap();