summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
diff options
context:
space:
mode:
authorStenzek <stenzek@gmail.com>2018-10-03 17:34:27 +1000
committerStenzek <stenzek@gmail.com>2018-10-29 11:46:06 +1000
commita7f334dc2a3eec0119d8b77ec3ff35bbc8aae5f9 (patch)
treed26810619b5fdefa7526619f3ae1dbd8155b9685 /Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
parent2b905eb06a806bc654281910d92693e2dcb6f201 (diff)
ControllerInterface: Don't crash on non-X11 QPA
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/ControllerInterface.h')
-rw-r--r--Source/Core/InputCommon/ControllerInterface/ControllerInterface.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
index c576b20fb3..2e078e8934 100644
--- a/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
+++ b/Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
@@ -10,6 +10,7 @@
#include <mutex>
#include <vector>
+#include "Common/WindowSystemInfo.h"
#include "InputCommon/ControllerInterface/Device.h"
// enable disable sources
@@ -39,8 +40,8 @@
class ControllerInterface : public ciface::Core::DeviceContainer
{
public:
- ControllerInterface() : m_is_init(false), m_hwnd(nullptr) {}
- void Initialize(void* const hwnd);
+ ControllerInterface() : m_is_init(false) {}
+ void Initialize(const WindowSystemInfo& wsi);
void RefreshDevices();
void Shutdown();
void AddDevice(std::shared_ptr<ciface::Core::Device> device);
@@ -56,7 +57,7 @@ private:
mutable std::mutex m_callbacks_mutex;
bool m_is_init;
std::atomic<bool> m_is_populating_devices{false};
- void* m_hwnd;
+ WindowSystemInfo m_wsi;
};
extern ControllerInterface g_controller_interface;