Leahnaya/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-04-24 07:08:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge a8a9f8d5f6 into 12935d5b25

Browse Source
This commit is contained in:
xmat123x 2026-03-20 23:40:54 -05:00 committed by GitHub
commit ba1c73dcb2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Core/Core/NetPlayServer.cpp
View File

@ -440,7 +440,7 @@ ConnectionError NetPlayServer::OnConnect(ENetPeer* incoming_connection, sf::Pack
if (netplay_version != Common::GetScmRevGitStr())
return ConnectionError::VersionMismatch;
if (m_is_running || m_start_pending)
if (m_start_pending)
return ConnectionError::GameRunning;
if (m_players.size() >= 255)
@ -463,7 +463,8 @@ ConnectionError NetPlayServer::OnConnect(ENetPeer* incoming_connection, sf::Pack
// force a ping on first netplay loop
m_update_pings = true;
AssignNewUserAPad(new_player);
if (!m_is_running)
AssignNewUserAPad(new_player);
// tell other players a new player joined
SendResponseToAllPlayers(MessageID::PlayerJoin, new_player.pid, new_player.name,