Don't even attempt to advertise a non-netgame server.

This appears to be a long-time bug that exists upstream too, but nobody even knew about it before the MS rules alert made it clear this was actually happening!

# Conflicts:
#	src/m_menu.c
This commit is contained in:
toaster 2022-08-24 15:04:09 +01:00
parent 41fa7fe14e
commit 851a2094cf
2 changed files with 3 additions and 3 deletions

View file

@ -3235,7 +3235,7 @@ void D_QuitNetGame(void)
if (nodeingame[i]) if (nodeingame[i])
HSendPacket(i, true, 0, 0); HSendPacket(i, true, 0, 0);
#ifdef MASTERSERVER #ifdef MASTERSERVER
if (serverrunning && cv_advertise.value) if (serverrunning && netgame && cv_advertise.value) // see mserv.c Online()
UnregisterServer(); UnregisterServer();
#endif #endif
} }

View file

@ -434,7 +434,7 @@ void UnregisterServer(void)
static boolean static boolean
Online (void) Online (void)
{ {
return ( serverrunning && cv_advertise.value ); return ( serverrunning && netgame && cv_advertise.value );
} }
static inline void SendPingToMasterServer(void) static inline void SendPingToMasterServer(void)
@ -532,7 +532,7 @@ Advertise_OnChange(void)
if (cv_advertise.value) if (cv_advertise.value)
{ {
if (serverrunning) if (serverrunning && netgame)
{ {
Lock_state(); Lock_state();
{ {