piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

ControllerInterface: don't call InvokeDevicesChangedCallbacks more than once when refreshing

Browse Source
This commit is contained in:
Michael M 2017-11-04 07:37:03 -07:00
parent fd7cbd633e
commit 8e6677be90
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp
View File

@ -47,6 +47,7 @@ void ControllerInterface::Initialize(void* const hwnd)
return;
m_hwnd = hwnd;
m_is_populating_devices = true;
#ifdef CIFACE_USE_DINPUT
// nothing needed
@ -88,6 +89,8 @@ void ControllerInterface::RefreshDevices()
m_devices.clear();
}
m_is_populating_devices = true;
#ifdef CIFACE_USE_DINPUT
ciface::DInput::PopulateDevices(reinterpret_cast<HWND>(m_hwnd));
#endif
@ -113,6 +116,9 @@ void ControllerInterface::RefreshDevices()
#ifdef CIFACE_USE_PIPES
ciface::Pipes::PopulateDevices();
#endif
m_is_populating_devices = false;
InvokeDevicesChangedCallbacks();
}
//
@ -188,7 +194,9 @@ void ControllerInterface::AddDevice(std::shared_ptr<ciface::Core::Device> device
NOTICE_LOG(SERIALINTERFACE, "Added device: %s", device->GetQualifiedName().c_str());
m_devices.emplace_back(std::move(device));
}
InvokeDevicesChangedCallbacks();
if (!m_is_populating_devices)
InvokeDevicesChangedCallbacks();
}
void ControllerInterface::RemoveDevice(std::function<bool(const ciface::Core::Device*)> callback)
@ -205,7 +213,9 @@ void ControllerInterface::RemoveDevice(std::function<bool(const ciface::Core::De
});
m_devices.erase(it, m_devices.end());
}
InvokeDevicesChangedCallbacks();
if (!m_is_populating_devices)
InvokeDevicesChangedCallbacks();
}
//

2
Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
View File

@ -4,6 +4,7 @@
#pragma once
#include <atomic>
#include <functional>
#include <memory>
#include <mutex>
@ -57,6 +58,7 @@ private:
std::vector<std::function<void()>> m_devices_changed_callbacks;
mutable std::mutex m_callbacks_mutex;
bool m_is_init;
std::atomic<bool> m_is_populating_devices{false};
void* m_hwnd;
};