From 2a47fb07682041b63ee6243bad3e7754e69e3999 Mon Sep 17 00:00:00 2001
From: bunnei <bunneidev@gmail.com>
Date: Sat, 20 Jul 2019 15:30:59 -0400
Subject: [PATCH] android: jni: button_manager: Fix circle pad on subsequent
 game launch.

- We were missing an UnregisterFactory call for AnalogDevice.
---
 src/android/app/src/main/jni/button_manager.cpp | 1 +
 src/android/app/src/main/jni/button_manager.h   | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/android/app/src/main/jni/button_manager.cpp b/src/android/app/src/main/jni/button_manager.cpp
index fcacc9d88..6b24c7a3c 100644
--- a/src/android/app/src/main/jni/button_manager.cpp
+++ b/src/android/app/src/main/jni/button_manager.cpp
@@ -311,6 +311,7 @@ void Init() {
 
 void Shutdown() {
     Input::UnregisterFactory<Input::ButtonDevice>("gamepad");
+    Input::UnregisterFactory<Input::AnalogDevice>("gamepad");
     button.reset();
     analog.reset();
 }
diff --git a/src/android/app/src/main/jni/button_manager.h b/src/android/app/src/main/jni/button_manager.h
index 6c6e4236c..9bd673903 100644
--- a/src/android/app/src/main/jni/button_manager.h
+++ b/src/android/app/src/main/jni/button_manager.h
@@ -132,4 +132,4 @@ std::string GenerateButtonParamPackage(int type);
 std::string GenerateAnalogButtonParamPackage(int axis, float axis_val);
 
 std::string GenerateAnalogParamPackage(int type);
-} // namespace InputManager
\ No newline at end of file
+} // namespace InputManager