From 78e8ccea6dd1759ec4bc32d17650e7c6828b3bc0 Mon Sep 17 00:00:00 2001 From: Thomas May Date: Wed, 6 May 2020 01:30:49 +0100 Subject: [PATCH 1/2] Update ControllerInterface.cpp --- .../InputCommon/ControllerInterface/ControllerInterface.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 189738e76b..aae014acf9 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -105,7 +105,8 @@ void ControllerInterface::RefreshDevices() InvokeDevicesChangedCallbacks(); #ifdef CIFACE_USE_WIN32 - ciface::Win32::PopulateDevices(m_wsi.render_surface); + // Should this be changed for other platforms? I don't have the means to test... + ciface::Win32::PopulateDevices(m_wsi.render_window); #endif #ifdef CIFACE_USE_XLIB if (m_wsi.type == WindowSystemType::X11) From 76ae1d40700eeecd6589b0f475d3c8ab5973b0d6 Mon Sep 17 00:00:00 2001 From: Thomas May Date: Sat, 9 May 2020 22:35:20 +0100 Subject: [PATCH 2/2] Apply fixes to all platforms --- .../ControllerInterface/ControllerInterface.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index aae014acf9..342869a69b 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -105,18 +105,17 @@ void ControllerInterface::RefreshDevices() InvokeDevicesChangedCallbacks(); #ifdef CIFACE_USE_WIN32 - // Should this be changed for other platforms? I don't have the means to test... ciface::Win32::PopulateDevices(m_wsi.render_window); #endif #ifdef CIFACE_USE_XLIB if (m_wsi.type == WindowSystemType::X11) - ciface::XInput2::PopulateDevices(m_wsi.render_surface); + ciface::XInput2::PopulateDevices(m_wsi.render_window); #endif #ifdef CIFACE_USE_OSX if (m_wsi.type == WindowSystemType::MacOS) { - ciface::OSX::PopulateDevices(m_wsi.render_surface); - ciface::Quartz::PopulateDevices(m_wsi.render_surface); + ciface::OSX::PopulateDevices(m_wsi.render_window); + ciface::Quartz::PopulateDevices(m_wsi.render_window); } #endif #ifdef CIFACE_USE_SDL