From 6e671d4894e56cd3af09d6e9af2635f030817361 Mon Sep 17 00:00:00 2001
From: toaster <rollerorbital@gmail.com>
Date: Sun, 24 Mar 2024 12:29:47 +0000
Subject: [PATCH] Re-order when refreshdirmenu is wiped

The problem with adding files mid-netgame was that the order is:
- menu code sends netxcmd for addfile
- getpackets processes addfile, sets refreshdirmenu
- NEW GAMETIC
- refreshdirmenu is set to 0
- menu code looks for refreshdirmenu, comes up empty

Now, the order is:
- menu code sends netxcmd for addfile
- refreshdirmenu is set to 0
- getpackets processes addfile, sets refreshdirmenu
- NEW GAMETIC
- menu code looks for refreshdirmenu, successfully finds it
- refreshdirmenu is set to 0
---
 src/d_clisrv.c | 2 ++
 src/d_main.cpp | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 8cefed899..466ba7a29 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -67,6 +67,7 @@
 #include "k_bans.h"
 #include "sanitize.h"
 #include "r_fps.h"
+#include "filesrch.h" // refreshdirmenu
 
 // cl loading screen
 #include "v_video.h"
@@ -6710,6 +6711,7 @@ void NetUpdate(void)
 		I_lock_mutex(&k_menu_mutex);
 #endif
 		M_Ticker();
+		refreshdirmenu = 0;
 #ifdef HAVE_THREADS
 		I_unlock_mutex(k_menu_mutex);
 #endif
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 7dcf0a7b8..6347f087c 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -69,7 +69,6 @@
 #include "fastcmp.h"
 #include "r_fps.h" // Frame interpolation/uncapped
 #include "keys.h"
-#include "filesrch.h" // refreshdirmenu
 #include "g_input.h" // tutorial mode control scheming
 #include "m_perfstats.h"
 #include "core/memory.h"
@@ -919,8 +918,6 @@ void D_SRB2Loop(void)
 
 		if (renderisnewtic)
 		{
-			refreshdirmenu = 0;
-
 			P_ResetInterpHudRandSeed(timeisprogressing);
 
 			// don't skip more than 10 frames at a time