ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Problems on Windows? Just SLEEP twice as long!

This commit is contained in:
Jordan Woyak 2013-02-11 15:58:23 -06:00
parent c2d2fb8c7c
commit 0fb7f65e04
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
View File

@ -75,6 +75,7 @@ HINSTANCE bthprops_lib = NULL;
static int initialized = 0; static int initialized = 0;
std::mutex g_connected_devices_lock;
static std::unordered_set<std::string> g_connected_devices; static std::unordered_set<std::string> g_connected_devices;
inline void init_lib() inline void init_lib()
@ -182,7 +183,7 @@ std::vector<Wiimote*> WiimoteScanner::FindWiimotes()
// Hacks... // Hacks...
if (attached_some) if (attached_some)
SLEEP(1000); SLEEP(2000);
GUID device_id; GUID device_id;
HDEVINFO device_info; HDEVINFO device_info;
@ -253,6 +254,8 @@ bool WiimoteScanner::IsReady() const
// Connect to a wiimote with a known device path. // Connect to a wiimote with a known device path.
bool Wiimote::Connect() bool Wiimote::Connect()
{ {
std::lock_guard<std::mutex> lk(g_connected_devices_lock);
// This is where we disallow connecting to the same device twice // This is where we disallow connecting to the same device twice
if (g_connected_devices.count(devicepath)) if (g_connected_devices.count(devicepath))
return false; return false;
@ -303,6 +306,7 @@ bool Wiimote::Connect()
void Wiimote::Disconnect() void Wiimote::Disconnect()
{ {
std::lock_guard<std::mutex> lk(g_connected_devices_lock);
g_connected_devices.erase(devicepath); g_connected_devices.erase(devicepath);
CloseHandle(dev_handle); CloseHandle(dev_handle);

2
Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.h
View File

@ -64,8 +64,6 @@ public:
// connecting and disconnecting from physical devices // connecting and disconnecting from physical devices
// (using address inserted by FindWiimotes) // (using address inserted by FindWiimotes)
// FYI, Connect/Disconnect are not thread safe even between unique objects (on windows)
bool Connect(); bool Connect();
void Disconnect(); void Disconnect();