diff options
| author | comex <comexk@gmail.com> | 2013-09-18 22:14:04 -0400 |
|---|---|---|
| committer | comex <comexk@gmail.com> | 2013-09-22 16:11:47 -0400 |
| commit | 229b35bb6d6741fb64488eebadcb31d4b0219d3f (patch) | |
| tree | 3485a0cd63a09d66e069a25cb3cf31cd3b1726f5 /Source | |
| parent | cf4d015b2aa63a472e262d736245224df4613627 (diff) | |
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.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Src/NetWindow.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/DolphinWX/Src/NetWindow.cpp b/Source/Core/DolphinWX/Src/NetWindow.cpp index 7f48455ef7..1ad5d57f1f 100644 --- a/Source/Core/DolphinWX/Src/NetWindow.cpp +++ b/Source/Core/DolphinWX/Src/NetWindow.cpp @@ -254,9 +254,12 @@ void NetPlaySetupDiag::OnHost(wxCommandEvent&) if(m_upnp_chk->GetValue()) netplay_server->TryPortmapping(port); #endif + MakeNetPlayDiag(port, game, true); + } + else + { + PanicAlertT("Failed to listen. Is another instance of the NetPlay server running?"); } - - MakeNetPlayDiag(port, game, true); } void NetPlaySetupDiag::OnJoin(wxCommandEvent&) |