Merge pull request #7249 from yourWaifu/discord-rpc-join

Add Discord Join Net Play functionally
This commit is contained in:
Pierre Bourdon 2018-08-19 13:43:33 +02:00 committed by GitHub
commit 0fdb6f4267
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 574 additions and 6 deletions

View file

@ -807,8 +807,15 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
void NetPlayServer::OnTraversalStateChanged()
{
if (m_dialog && m_traversal_client->GetState() == TraversalClient::Failure)
if (!m_dialog)
return;
const TraversalClient::State state = m_traversal_client->GetState();
if (state == TraversalClient::Failure)
m_dialog->OnTraversalError(m_traversal_client->GetFailureReason());
m_dialog->OnTraversalStateChanged(state);
}
// called from ---GUI--- thread