From e907f6adf0e65de2e9536d0b4da2a268adc161cc Mon Sep 17 00:00:00 2001
From: Shpoike <Shpoike@users.noreply.github.com>
Date: Fri, 11 Aug 2023 15:03:25 +0100
Subject: [PATCH] Be a bit more verbose about errors.

---
 engine/client/cl_main.c | 2 +-
 engine/client/menu.c    | 9 +++++++++
 engine/server/sv_main.c | 3 +--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c
index 0bbde383f..21c99fb60 100644
--- a/engine/client/cl_main.c
+++ b/engine/client/cl_main.c
@@ -1630,7 +1630,7 @@ CL_Connect_f
 ================
 */
 void CL_Connect_c(int argn, const char *partial, struct xcommandargcompletioncb_s *ctx);
-void CL_Connect_f (void)
+static void CL_Connect_f (void)
 {
 	char	*server;
 
diff --git a/engine/client/menu.c b/engine/client/menu.c
index 8489489a7..bcce14c23 100644
--- a/engine/client/menu.c
+++ b/engine/client/menu.c
@@ -399,6 +399,15 @@ void M_ToggleMenu_f (void)
 #endif
 
 #ifndef NOBUILTINMENUS
+	{
+		extern cvar_t cl_disconnectreason;
+		if (*cl_disconnectreason.string)
+		{
+			Menu_Prompt(NULL, NULL, cl_disconnectreason.string, NULL, NULL, "Okay", true);
+			Cvar_Set(&cl_disconnectreason, "");
+		}
+	}
+
 	M_Menu_Main_f ();
 	Key_Dest_Remove(kdm_console|kdm_cwindows);
 #endif
diff --git a/engine/server/sv_main.c b/engine/server/sv_main.c
index f3efc0cbb..3e1756d76 100644
--- a/engine/server/sv_main.c
+++ b/engine/server/sv_main.c
@@ -381,11 +381,10 @@ void VARGS SV_Error (char *error, ...)
 
 	if (!isDedicated)	//dedicated servers crash...
 	{
-		extern cvar_t cl_disconnectreason;
 		extern jmp_buf 	host_abort;
 		SCR_EndLoadingPlaque();
 		SV_UnspawnServer();
-		Cvar_Set(&cl_disconnectreason, va("SV_Error: %s", string));
+		CL_Disconnect(string);
 		inerror=false;
 		longjmp (host_abort, 1);
 	}