ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5897 from ligfx/netplayremovegoto 

NetPlayServer: remove goto statements
This commit is contained in:
Leo Lam 2017-08-07 14:16:27 +08:00 committed by GitHub
parent dbb26a2b54 2abf13ae36
commit 9e51a7f8d4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/Core/NetPlayServer.cpp
View File

@ -959,17 +959,15 @@ void NetPlayServer::TryPortmapping(u16 port)
void NetPlayServer::mapPortThread(const u16 port) void NetPlayServer::mapPortThread(const u16 port)
{ {
if (!m_upnp_inited) if (!m_upnp_inited)
if (!initUPnP()) initUPnP();
goto fail;
if (!UPnPMapPort(m_upnp_ourip, port)) if (m_upnp_inited && UPnPMapPort(m_upnp_ourip, port))
goto fail; {
NOTICE_LOG(NETPLAY, "Successfully mapped port %d to %s.", port, m_upnp_ourip.c_str());
return;
}
NOTICE_LOG(NETPLAY, "Successfully mapped port %d to %s.", port, m_upnp_ourip.c_str());
return;
fail:
WARN_LOG(NETPLAY, "Failed to map port %d to %s.", port, m_upnp_ourip.c_str()); WARN_LOG(NETPLAY, "Failed to map port %d to %s.", port, m_upnp_ourip.c_str());
return;
} }
// UPnP thread: try to unmap a port // UPnP thread: try to unmap a port