The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-01-24 23:11:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

ControllerInterface: fix DSU using the same client uid between server and controllers queries

Browse Source 
that's not the way it's supposed to work
This commit is contained in:
Filoppi 2021-05-15 12:25:31 +03:00
parent c648058efd
commit 83806462ec
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/InputCommon/ControllerInterface/DualShockUDPClient/DualShockUDPClient.cpp
View File

@ -141,7 +141,6 @@ public:
private: private:
const std::string m_name; const std::string m_name;
const int m_index; const int m_index;
u32 m_client_uid = Common::Random::GenerateValue<u32>();
sf::UdpSocket m_socket; sf::UdpSocket m_socket;
SteadyClock::time_point m_next_reregister = SteadyClock::time_point::min(); SteadyClock::time_point m_next_reregister = SteadyClock::time_point::min();
Proto::MessageType::PadDataResponse m_pad_data{}; Proto::MessageType::PadDataResponse m_pad_data{};
@ -314,7 +313,6 @@ static void Restart()
StopHotplugThread(); StopHotplugThread();
s_client_uid = Common::Random::GenerateValue<u32>();
s_next_listports = std::chrono::steady_clock::time_point::min(); s_next_listports = std::chrono::steady_clock::time_point::min();
for (auto& server : s_servers) for (auto& server : s_servers)
{ {
@ -327,6 +325,8 @@ static void Restart()
PopulateDevices(); // Only removes devices PopulateDevices(); // Only removes devices
s_client_uid = Common::Random::GenerateValue<u32>();
if (s_servers_enabled && !s_servers.empty()) if (s_servers_enabled && !s_servers.empty())
StartHotplugThread(); StartHotplugThread();
} }
@ -502,7 +502,7 @@ void Device::UpdateInput()
{ {
m_next_reregister = now + SERVER_REREGISTER_INTERVAL; m_next_reregister = now + SERVER_REREGISTER_INTERVAL;
Proto::Message<Proto::MessageType::PadDataRequest> msg(m_client_uid); Proto::Message<Proto::MessageType::PadDataRequest> msg(s_client_uid);
auto& data_req = msg.m_message; auto& data_req = msg.m_message;
data_req.register_flags = Proto::RegisterFlags::PadID; data_req.register_flags = Proto::RegisterFlags::PadID;
data_req.pad_id_to_register = m_index; data_req.pad_id_to_register = m_index;