From c8b49c8a35eb6cfcf042b6287a02d2a454919d1f Mon Sep 17 00:00:00 2001
From: kreatordxx <>
Date: Sat, 27 Mar 2010 04:30:59 +0000
Subject: [PATCH] Finally fix bug where if you start a single player game then
 a multiplayer game, time is stopped. Always start time if it's stopped and
 the game window is activated

---
 CHANGELOG.txt | 1 +
 main/game.c   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 58613ee51..8ce8e39d6 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -4,6 +4,7 @@ D1X-Rebirth Changelog
 --------
 main/kmatrix.c, main/net_udp.c: Initialise 'playing' to 0 for UDP kmatrix, making sure player progresses to next level; always return 1 when starting to join a UDP game so it doesn't immediately return to the main menu
 main/gameseq.c, main/menu.c: Hide mission dialog before the level intro screens are shown, make sure it doesn't try to show it again after it was closed - fixing bad memory access
+main/game.c: Finally fix bug where if you start a single player game then a multiplayer game, time is stopped. Always start time if it's stopped and the game window is activated
 
 20100326
 --------
diff --git a/main/game.c b/main/game.c
index b9939d970..ff86d6fb7 100644
--- a/main/game.c
+++ b/main/game.c
@@ -993,7 +993,7 @@ int game_handler(window *wind, d_event *event, void *data)
 		case EVENT_WINDOW_ACTIVATED:
 			game_flush_inputs();
 
-			if (time_paused && !(((Game_mode & GM_MULTI) && (Newdemo_state != ND_STATE_PLAYBACK)) && (!Endlevel_sequence)) )
+			if (time_paused)
 				start_time();
 
 			if (!((Game_mode & GM_MULTI) && (Newdemo_state != ND_STATE_PLAYBACK)))