piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-01 18:48:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

TraversalClient: Convert state enum into an enum class

Browse Source 
Prevents implicit conversions and prevents identifiers from polluting
the class scope.
This commit is contained in:
Lioncash
2021-01-19 14:00:01 -05:00
parent ebf3b5faf4
commit 2021175809
5 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Core/Core/NetPlayClient.cpp
View File

@ -174,7 +174,7 @@ NetPlayClient::NetPlayClient(const std::string& address, const u16 port, NetPlay
m_traversal_client = g_TraversalClient.get();
// If we were disconnected in the background, reconnect.
if (m_traversal_client->GetState() == TraversalClient::Failure)
if (m_traversal_client->HasFailed())
m_traversal_client->ReconnectToServer();
m_traversal_client->m_Client = this;
m_host_spec = address;
@ -1755,12 +1755,13 @@ void NetPlayClient::OnTraversalStateChanged()
const TraversalClient::State state = m_traversal_client->GetState();
if (m_connection_state == ConnectionState::WaitingForTraversalClientConnection &&
state == TraversalClient::Connected)
state == TraversalClient::State::Connected)
{
m_connection_state = ConnectionState::WaitingForTraversalClientConnectReady;
m_traversal_client->ConnectToClient(m_host_spec);
}
else if (m_connection_state != ConnectionState::Failure && state == TraversalClient::Failure)
else if (m_connection_state != ConnectionState::Failure &&
state == TraversalClient::State::Failure)
{
Disconnect();
m_dialog->OnTraversalError(m_traversal_client->GetFailureReason());