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

Merge pull request #8795 from WamWooWam/master 

InputCommon: Use the Window handle when initializing DirectInput.
This commit is contained in:
Connor McLaughlin 2020-05-10 19:16:15 +10:00 committed by GitHub
parent 0990f99608 76ae1d4070
commit 2488e4a587
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,17 +105,17 @@ void ControllerInterface::RefreshDevices()
InvokeDevicesChangedCallbacks(); InvokeDevicesChangedCallbacks();
#ifdef CIFACE_USE_WIN32 #ifdef CIFACE_USE_WIN32
ciface::Win32::PopulateDevices(m_wsi.render_surface); ciface::Win32::PopulateDevices(m_wsi.render_window);
#endif #endif
#ifdef CIFACE_USE_XLIB #ifdef CIFACE_USE_XLIB
if (m_wsi.type == WindowSystemType::X11) if (m_wsi.type == WindowSystemType::X11)
ciface::XInput2::PopulateDevices(m_wsi.render_surface); ciface::XInput2::PopulateDevices(m_wsi.render_window);
#endif #endif
#ifdef CIFACE_USE_OSX #ifdef CIFACE_USE_OSX
if (m_wsi.type == WindowSystemType::MacOS) if (m_wsi.type == WindowSystemType::MacOS)
{ {
ciface::OSX::PopulateDevices(m_wsi.render_surface); ciface::OSX::PopulateDevices(m_wsi.render_window);
ciface::Quartz::PopulateDevices(m_wsi.render_surface); ciface::Quartz::PopulateDevices(m_wsi.render_window);
} }
#endif #endif
#ifdef CIFACE_USE_SDL #ifdef CIFACE_USE_SDL