jprdonnelly/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2026-04-11 14:00:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7564 from Techjar/netplay-sync-wii-shutdown

Browse Source 
NetPlay: Sync power button event
This commit is contained in:
Pierre Bourdon
2018-11-13 22:33:59 +01:00
committed by GitHub
parent 3153b9e94f ef89e4e70c
commit 41333fa971
7 changed files with 44 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -569,6 +569,12 @@ unsigned int NetPlayClient::OnData(sf::Packet& packet)
}
break;
case NP_MSG_POWER_BUTTON:
{
m_dialog->OnMsgPowerButton();
}
break;
case NP_MSG_PING:
{
u32 ping_key = 0;
@@ -1702,6 +1708,13 @@ void NetPlayClient::RequestStopGame()
SendStopGamePacket();
}
void NetPlayClient::SendPowerButtonEvent()
{
sf::Packet packet;
packet << static_cast<MessageId>(NP_MSG_POWER_BUTTON);
SendAsync(std::move(packet));
}
// called from ---GUI--- thread
bool NetPlayClient::LocalPlayerHasControllerMapped() const
{
@@ -1884,6 +1897,12 @@ void SetSIPollBatching(bool state)
s_si_poll_batching = state;
}
void SendPowerButtonEvent()
{
ASSERT(IsNetPlayRunning());
netplay_client->SendPowerButtonEvent();
}
void NetPlay_Enable(NetPlayClient* const np)
{
std::lock_guard<std::mutex> lk(crit_netplay_client);