mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-28 11:49:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ControllerInterface: Don't crash on non-X11 QPA

Browse source
This commit is contained in:
Stenzek 2018-10-03 17:34:27 +10:00
commit a7f334dc2a
5 changed files with 33 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Source/Core/InputCommon/ControllerInterface/ControllerInterface.h
View file

@ -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;