Merge pull request #6522 from obrakmann/fix6517_lobby_music_crash

Check world for null in MusicPlayerLogic to prevent crashing the lobby
This commit is contained in:
Matthias Mailänder
2014-09-21 10:17:40 +02:00

View File

@@ -84,7 +84,7 @@ namespace OpenRA.Mods.RA.Widgets.Logic
var installButton = widget.GetOrNull<ButtonWidget>("INSTALL_BUTTON"); var installButton = widget.GetOrNull<ButtonWidget>("INSTALL_BUTTON");
if (installButton != null) if (installButton != null)
{ {
installButton.IsDisabled = () => !world.IsShellmap; installButton.IsDisabled = () => world == null || !world.IsShellmap;
var args = new string[] { "Launch.Window=INSTALL_MUSIC_PANEL" }; var args = new string[] { "Launch.Window=INSTALL_MUSIC_PANEL" };
installButton.OnClick = () => installButton.OnClick = () =>
{ {