Merge remote-tracking branch 'chaotic/master' into protocols

This commit is contained in:
Fafabis committed 2021-05-02 13:09:08 -03:00
commit 3034d6c062
2 files changed
+6 -6

No files matched your search

+4
View File
@@ -515,6 +515,10 @@ ifdef ZDEBUG
CPPFLAGS+=-DZDEBUG
endif
ifdef DUMPCONSISTENCY
CPPFLAGS+=-DDUMPCONSISTENCY
endif
ifdef DEVELOP
CPPFLAGS+=-DDEVELOP
endif
+2 -6
View File
@@ -361,8 +361,7 @@ static const char *DRPC_GetServerIP(void)
{
// We're not the server, so we could successfully get the IP!
// No need to do anything else :)
sprintf(self_ip, "%s:%u", address, current_port);
return self_ip;
return address;
}
}
@@ -461,10 +460,7 @@ void DRPC_UpdatePresence(void)
// Grab the host's IP for joining.
if ((join = DRPC_GetServerIP()) != NULL)
{
char *xorjoin = DRPC_XORIPString(join);
discordPresence.joinSecret = xorjoin;
free(xorjoin);
discordPresence.joinSecret = DRPC_XORIPString(join);
joinSecretSet = true;
}
}