From 229b35bb6d6741fb64488eebadcb31d4b0219d3f Mon Sep 17 00:00:00 2001 From: comex Date: Wed, 18 Sep 2013 22:14:04 -0400 Subject: [PATCH] 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. --- Source/Core/DolphinWX/Src/NetWindow.cpp | 7 +++++-- 1 file 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&)