diff options
| author | Anthony <Helios747@users.noreply.github.com> | 2016-11-30 20:47:38 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-30 20:47:38 -0600 |
| commit | a95e3c875e2749b4a489aa988f5b35608f5a8b59 (patch) | |
| tree | 5239317db159c4fc5ab7272e3ac866d1487fca54 /Source/Core/InputCommon/ControllerInterface/Android | |
| parent | e2018f22085dd168b8ef6ec1c8ff6260e8c3e8b2 (diff) | |
| parent | 3e69d066f5e9ad0a1097d806c656035398bbb7bc (diff) | |
Merge pull request #4343 from ligfx/fixsdlcrash
ControllerInterface: Fix crashes when using SDL controllers
Diffstat (limited to 'Source/Core/InputCommon/ControllerInterface/Android')
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Android/Android.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/InputCommon/ControllerInterface/Android/Android.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index a5e995f6cc..983108f356 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -10,7 +10,7 @@ namespace ciface { namespace Android { -void Init() +void PopulateDevices() { for (int i = 0; i < 8; ++i) g_controller_interface.AddDevice(std::make_shared<Touchscreen>(i)); diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.h b/Source/Core/InputCommon/ControllerInterface/Android/Android.h index 987aaed863..bf588719c2 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.h +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.h @@ -11,7 +11,7 @@ namespace ciface { namespace Android { -void Init(); +void PopulateDevices(); class Touchscreen : public Core::Device { private: |