From a8ddc4e360e1f16e32fead1e5ab2b468d0e0279a Mon Sep 17 00:00:00 2001
From: Paul Chote <pchote@users.noreply.github.com>
Date: Sat, 1 Aug 2015 19:21:12 +0100
Subject: [PATCH] Always start the game with a random song.

This fixes the issue where games will always start
with shellmap theme.
---
 OpenRA.Game/Traits/World/MusicPlaylist.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/OpenRA.Game/Traits/World/MusicPlaylist.cs b/OpenRA.Game/Traits/World/MusicPlaylist.cs
index e79777dba3..babef06050 100644
--- a/OpenRA.Game/Traits/World/MusicPlaylist.cs
+++ b/OpenRA.Game/Traits/World/MusicPlaylist.cs
@@ -61,10 +61,11 @@ namespace OpenRA.Traits
 
 			random = playlist.Shuffle(Game.CosmeticRandom).ToArray();
 
+			// Always start with a random song
+			currentSong = random.FirstOrDefault();
+
 			if (SongExists(info.StartingMusic))
-			{
 				currentSong = world.Map.Rules.Music[info.StartingMusic];
-			}
 			else if (SongExists(info.BackgroundMusic))
 			{
 				currentSong = currentBackgroundSong = world.Map.Rules.Music[info.BackgroundMusic];