diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2020-05-10 19:16:15 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-10 19:16:15 +1000 |
| commit | 2488e4a5877d5424169649802bfb2c1ba9970fd5 (patch) | |
| tree | 783e0d95d3aebec4dd9c9ac952448e578941132f /Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | |
| parent | 0990f9960820a8c316d289faebf4a302ef7124c3 (diff) | |
| parent | 76ae1d40700eeecd6589b0f475d3c8ab5973b0d6 (diff) | |
Merge pull request #8795 from WamWooWam/master
InputCommon: Use the Window handle when initializing DirectInput.
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp index 189738e76b..342869a69b 100644 --- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp +++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.cpp @@ -105,17 +105,17 @@ void ControllerInterface::RefreshDevices() InvokeDevicesChangedCallbacks(); #ifdef CIFACE_USE_WIN32 - ciface::Win32::PopulateDevices(m_wsi.render_surface); + 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 |