From 5456d990d16bee5a03796e5230ffc1117a981393 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sat, 13 Apr 2024 22:39:10 +0200 Subject: [PATCH] Android/ControllerInterface: Run the init code This was broken by a9a9fdd9e9. Because Init didn't run, the Android input backend would crash whenever it tried to call into JVM code. --- .../Core/InputCommon/ControllerInterface/Android/Android.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp index 69f0e5b5ec..c60679daf0 100644 --- a/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp +++ b/Source/Core/InputCommon/ControllerInterface/Android/Android.cpp @@ -448,7 +448,7 @@ namespace ciface::Android class InputBackend final : public ciface::InputBackend { public: - using ciface::InputBackend::InputBackend; + InputBackend(ControllerInterface* controller_interface); ~InputBackend(); void PopulateDevices() override; @@ -797,7 +797,8 @@ static jintArray CreateKeyCodesArray(JNIEnv* env) return keycodes_array; } -void Init() +InputBackend::InputBackend(ControllerInterface* controller_interface) + : ciface::InputBackend(controller_interface) { JNIEnv* env = IDCache::GetEnvForThread();