Merge branch 'discord-invite-fix' into 'master'

src/discord.c

@@ -341,15 +341,14 @@ static void DRPC_GotServerIP(UINT32 address)
 {
 	const unsigned char * p = (const unsigned char *)&address;
 	sprintf(self_ip, "%u.%u.%u.%u:%u", p[0], p[1], p[2], p[3], current_port);
-	DRPC_UpdatePresence();
 }
 
 /*--------------------------------------------------
 	static const char *DRPC_GetServerIP(void)
 
 		Retrieves the IP address of the server that you're
-		connected to. Will attempt to use curl for getting your
-		own IP address, if it's not yours.
+		connected to. Will attempt to use STUN for getting your
+		own IP address.
 --------------------------------------------------*/
 static const char *DRPC_GetServerIP(void)
 {
@@ -442,6 +441,19 @@ void DRPC_UpdatePresence(void)
 	// Server info
 	if (netgame)
 	{
+		if (cv_advertise.value)
+		{
+			discordPresence.state = "Public";
+		}
+		else
+		{
+			discordPresence.state = "Private";
+		}
+
+		discordPresence.partyId = server_context; // Thanks, whoever gave us Mumble support, for implementing the EXACT thing Discord wanted for this field!
+		discordPresence.partySize = D_NumPlayers(); // Players in server
+		discordPresence.partyMax = discordInfo.maxPlayers; // Max players
+
 		if (DRPC_InvitesAreAllowed() == true)
 		{
 			const char *join;
@@ -455,24 +467,7 @@ void DRPC_UpdatePresence(void)
 
 				joinSecretSet = true;
 			}
-			else
-			{
-				return;
-			}
-		}
-
-		if (cv_advertise.value)
-		{
-			discordPresence.state = "Public";
 		}
-		else
-		{
-			discordPresence.state = "Private";
-		}
-
-		discordPresence.partyId = server_context; // Thanks, whoever gave us Mumble support, for implementing the EXACT thing Discord wanted for this field!
-		discordPresence.partySize = D_NumPlayers(); // Players in server
-		discordPresence.partyMax = discordInfo.maxPlayers; // Max players
 	}
 	else
 	{