From 3e69d066f5e9ad0a1097d806c656035398bbb7bc Mon Sep 17 00:00:00 2001
From: Michael Maltese <michaeljosephmaltese@gmail.com>
Date: Sun, 16 Oct 2016 13:39:05 -0700
Subject: ControllerInterface: replace Reinitialize with RefreshDevices

The SDL backend crashes when you close a joystick after SDL_Quit has
been called. Some backends don't need to be shutdown and
re-initialized everytime, we can just ask to enumerate devices again.
---
 Source/Core/InputCommon/ControllerInterface/Android/Android.cpp | 2 +-
 Source/Core/InputCommon/ControllerInterface/Android/Android.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'Source/Core/InputCommon/ControllerInterface/Android')

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:
-- 
cgit v1.2.3