Merge pull request #7722 from penev92/bleed_diplomacyWindow

Closes #7391

OpenRA.Game/Map/PlayerReference.cs

@@ -27,6 +27,7 @@ namespace OpenRA
 
 		public bool LockRace = false;
 		public string Race;
+		public string RaceFlagName;
 
 		// ColorRamp naming retained for backward compatibility
 		public bool LockColor = false;

OpenRA.Game/Player.cs

@@ -46,7 +46,9 @@ namespace OpenRA
 		public Shroud Shroud;
 		public World World { get; private set; }
 
-		static CountryInfo ChooseCountry(World world, string name, bool requireSelectable = true)
+		string selectedCountryName;
+
+		CountryInfo ChooseCountry(World world, string name, bool requireSelectable = true)
 		{
 			var selectableCountries = world.Map.Rules.Actors["world"].Traits
 				.WithInterface<CountryInfo>().Where(c => !requireSelectable || c.Selectable)
@@ -55,6 +57,8 @@ namespace OpenRA
 			var selected = selectableCountries.FirstOrDefault(c => c.Race == name)
 				?? selectableCountries.Random(world.SharedRandom);
 
+			selectedCountryName = selected.Name;
+
 			// Don't loop infinite
 			for (var i = 0; i <= 10 && selected.RandomRaceMembers.Any(); i++)
 			{
@@ -83,6 +87,8 @@ namespace OpenRA
 				PlayerName = client.Name;
 				botType = client.Bot;
 				Country = ChooseCountry(world, client.Race);
+				pr.Race = selectedCountryName;
+				pr.RaceFlagName = client.Race;
 			}
 			else
 			{