Merge pull request #2252 from mathieui/traversal-timeout

NetPlay: Don’t wait forever in the traversal client

1 files changed, 5 insertions, 0 deletions

diff --git a/Source/Core/Core/NetPlayClient.cpp b/Source/Core/Core/NetPlayClient.cpp
index b424932e77..1802a67e59 100644
--- a/Source/Core/Core/NetPlayClient.cpp
+++ b/Source/Core/Core/NetPlayClient.cpp
@@ -137,6 +137,9 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay
 		OnTraversalStateChanged();
 		m_connecting = true;
 
+		Common::Timer connect_timer;
+		connect_timer.Start();
+
 		while (m_connecting)
 		{
 			ENetEvent netEvent;
@@ -160,6 +163,8 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay
 					break;
 				}
 			}
+			if (connect_timer.GetTimeElapsed() > 5000)
+				break;
 		}
 		PanicAlertT("Failed To Connect!");
 	}