Merge pull request #4853 from ligfx/always_connected

GCPadEmu: only connected if default device connected

1 files changed, 7 insertions, 0 deletions

diff --git a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
index cf70fa8468..98b9e5828b 100644
--- a/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
+++ b/Source/Core/InputCommon/ControllerEmu/ControllerEmu.cpp
@@ -34,6 +34,8 @@ std::unique_lock<std::recursive_mutex> EmulatedController::GetStateLock()
 void EmulatedController::UpdateReferences(const ControllerInterface& devi)
 {
   const auto lock = GetStateLock();
+  m_default_device_is_connected = devi.HasConnectedDevice(m_default_device);
+
   for (auto& ctrlGroup : groups)
   {
     for (auto& control : ctrlGroup->controls)
@@ -48,6 +50,11 @@ void EmulatedController::UpdateReferences(const ControllerInterface& devi)
   }
 }
 
+bool EmulatedController::IsDefaultDeviceConnected() const
+{
+  return m_default_device_is_connected;
+}
+
 const ciface::Core::DeviceQualifier& EmulatedController::GetDefaultDevice() const
 {
   return m_default_device;