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

When hosting, don't try to connect if listening failed. 

If another instance of the server is running on the same computer, this
would cause Dolphin to confusingly connect to it.
This commit is contained in:
comex 2013-09-18 22:14:04 -04:00
parent cf4d015b2a
commit 229b35bb6d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/DolphinWX/Src/NetWindow.cpp
View File

@ -254,10 +254,13 @@ void NetPlaySetupDiag::OnHost(wxCommandEvent&)
if(m_upnp_chk->GetValue()) if(m_upnp_chk->GetValue())
netplay_server->TryPortmapping(port); netplay_server->TryPortmapping(port);
#endif #endif
}
MakeNetPlayDiag(port, game, true); MakeNetPlayDiag(port, game, true);
} }
else
{
PanicAlertT("Failed to listen. Is another instance of the NetPlay server running?");
}
}
void NetPlaySetupDiag::OnJoin(wxCommandEvent&) void NetPlaySetupDiag::OnJoin(wxCommandEvent&)
{ {