Merge pull request #3288 from Citadel-Station-13/upstream-merge-31477

[MIRROR] Fix a bug in the new lobby music system
2017-10-10 22:31:43 -04:00
parent 36498f3a47 f834eec4d2
commit 1a35063877
1 changed files with 4 additions and 2 deletions
@@ -118,8 +118,10 @@ SUBSYSTEM_DEF(ticker)
 				
 	if(isemptylist(music))
 		music = world.file2list(ROUND_START_MUSIC_LIST, "\n")
-
-	login_music = pick(music)
+		login_music = pick(music)
+	else
+		login_music = "config/title_music/sounds/[pick(music)]"
+	

 	if(!GLOB.syndicate_code_phrase)
 		GLOB.syndicate_code_phrase	= generate_code_phrase()