Merge pull request #4039 from Citadel-Station-13/upstream-merge-32900

[MIRROR] Fixes lobby timer on setup failure
2017-11-20 19:04:37 +00:00
parent ceda48865d 51ccd4daa9
commit 580554fb2a
1 changed files with 1 additions and 0 deletions
@@ -194,6 +194,7 @@ SUBSYSTEM_DEF(ticker)
 				//setup failed
 				current_state = GAME_STATE_STARTUP
 				start_at = world.time + (CONFIG_GET(number/lobby_countdown) * 10)
+				timeLeft = null
 				Master.SetRunLevel(RUNLEVEL_LOBBY)

 		if(GAME_STATE_PLAYING)