From 05647a9633cfc85ebd670188119e457abeed23f5 Mon Sep 17 00:00:00 2001
From: NepDisk <nepdisk@noreply.codeberg.org>
Date: Sat, 2 Aug 2025 12:37:18 -0400
Subject: [PATCH] Fix -connect crash

---
 src/d_clisrv.c | 1 +
 src/d_main.cpp | 2 ++
 src/f_finale.c | 2 +-
 src/f_finale.h | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 0e82c5380..5075ab50d 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2052,6 +2052,7 @@ static boolean CL_ServerConnectionTicker(const char *tmpsave, tic_t *oldtic, tic
 		{
 			if (cl_mode != CL_DOWNLOADFILES && cl_mode != CL_DOWNLOADSAVEGAME)
 			{
+				F_CacheTitleScreen();
 				F_MenuPresTicker(true); // title sky
 				F_TitleScreenTicker(true);
 				F_TitleScreenDrawer();
diff --git a/src/d_main.cpp b/src/d_main.cpp
index e68a67dfe..5bd8e57d1 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -1447,7 +1447,9 @@ void D_SRB2Main(void)
 
 	// init title screen display params
 	if (M_GetUrlProtocolArg() || M_CheckParm("-connect"))
+	{
 		F_InitMenuPresValues(true);
+	}
 
 	//---------------------------------------------------- READY TIME
 	// we need to check for dedicated before initialization of some subsystems
diff --git a/src/f_finale.c b/src/f_finale.c
index ca411f0c5..dd76e83d3 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -1276,7 +1276,7 @@ else if (strlen(name) <= 6) \
 else \
 	arr[0] = 0;
 
-static void F_CacheTitleScreen(void)
+void F_CacheTitleScreen(void)
 {
 	UINT16 i;
 
diff --git a/src/f_finale.h b/src/f_finale.h
index 951a6e98b..4c8da0b23 100644
--- a/src/f_finale.h
+++ b/src/f_finale.h
@@ -76,6 +76,7 @@ boolean F_GetPromptHideHud(fixed_t y);
 
 void F_StartIntro(void);
 void F_StartTitleScreen(void);
+void F_CacheTitleScreen(void);
 void F_StartCredits(void);
 void F_BlanStartCredits(void);