mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8284 from fr500/master

Browse Source 
[fix] potential crash when username is empty and discord is disabled
This commit is contained in:
Twinaphex 2019-02-14 06:46:46 +01:00 committed by GitHub
commit 9b8efbc712
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
network/netplay/netplay_frontend.c
View File

@ -894,12 +894,12 @@ static void netplay_announce(void)
netplay_get_architecture(frontend_architecture, sizeof(frontend_architecture));
if (!string_is_empty(settings->paths.username))
net_http_urlencode(&username, settings->paths.username);
#ifdef HAVE_DISCORD
else
if(discord_is_ready())
net_http_urlencode(&username, discord_get_own_username());
else
#endif
net_http_urlencode(&username, settings->paths.username);
net_http_urlencode(&corename, system->library_name);
net_http_urlencode(&coreversion, system->library_version);
net_http_urlencode(&frontend_ident, frontend_architecture);
@ -1509,7 +1509,7 @@ bool init_netplay(void *direct_host, const char *server, unsigned port)
&cbs,
settings->bools.netplay_nat_traversal,
#ifdef HAVE_DISCORD
string_is_empty(settings->paths.username) ? discord_get_own_username() :
discord_get_own_username() ? discord_get_own_username() :
#endif
settings->paths.username,
quirks);