From ce46cebce0b46215513a92772184316ca5ced86b Mon Sep 17 00:00:00 2001
From: myT <mighty.cow@mailinator.com>
Date: Thu, 25 Jan 2018 04:49:33 +0100
Subject: [PATCH] during id pak downloads, the time-out is 5 seconds instead of
 cl_timeout

---
 changelog.txt           | 2 ++
 code/client/cl_main.cpp | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 05941e9..43c68fd 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,8 @@
 
 DD Mmm 18 - 1.50
 
+chg: during id downloads (cl_allowDownload -1), the time-out is 5 seconds instead of cl_timeout
+
 chg: the "nextdemo" cvar is now also used when playback stops before reaching the demo's end
 
 chg: mouse motion is no longer forwarded to the mod when the console is down
diff --git a/code/client/cl_main.cpp b/code/client/cl_main.cpp
index 8273396..16be5f1 100644
--- a/code/client/cl_main.cpp
+++ b/code/client/cl_main.cpp
@@ -1472,12 +1472,12 @@ static void CL_CheckTimeout()
 		return;
 	}
 
+	const int timeout = clc.download ? 5000 : (cl_timeout->integer * 1000);
 	if ( ( !CL_Paused() || !sv_paused->integer )
 		&& cls.state >= CA_CONNECTED && cls.state != CA_CINEMATIC
-		&& cls.realtime - clc.lastPacketTime > cl_timeout->value*1000) {
+		&& cls.realtime - clc.lastPacketTime > timeout) {
 		if (++cl.timeoutcount > 5) {	// timeoutcount saves debugger
-			Com_Printf ("\nServer connection timed out.\n");
-			CL_Disconnect( qtrue );
+			Com_Error( ERR_DROP, "Server connection timed out" );
 			return;
 		}
 	} else {