Merge remote-tracking branch 'upstream/master' into no-more-colourinfo

This commit is contained in:
Dean Herbert
2017-07-25 10:14:48 +09:00
9 changed files with 29 additions and 8 deletions

View File

@ -27,7 +27,7 @@ namespace osu.Game.Screens.Multiplayer
set
{
host.Text = value.Username;
flagContainer.Children = new[] { new DrawableFlag(value.Country?.FlagName ?? @"__") { RelativeSizeAxes = Axes.Both } };
flagContainer.Children = new[] { new DrawableFlag(value.Country?.FlagName) { RelativeSizeAxes = Axes.Both } };
}
}