diff options
| author | Admiral H. Curtiss <pikachu025@gmail.com> | 2022-07-19 00:50:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-19 00:50:32 +0200 |
| commit | fa30ba18f5c9dbf06f7df0c1e9bd04065a2c439f (patch) | |
| tree | 6a0367fa30d1bbb7ee08224298f95c04e92c0cc9 /Source/Android/jni/MainAndroid.cpp | |
| parent | dd67d5fbc4aeffe78daa7b1697ebf39bdd7ccd3e (diff) | |
| parent | dabad822193f23bd01c13c4d0798f0a507e910eb (diff) | |
Merge pull request #10783 from JosJuice/frontend-controller-init
Require frontend to initialize controllers
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 77c373a481..d41ebe4cc9 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include <EGL/egl.h> -#include <UICommon/GameFile.h> #include <android/log.h> #include <android/native_window_jni.h> #include <cstdio> @@ -56,13 +55,13 @@ #include "InputCommon/ControllerInterface/Touch/ButtonManager.h" #include "InputCommon/GCAdapter.h" +#include "UICommon/GameFile.h" #include "UICommon/UICommon.h" #include "VideoCommon/OnScreenDisplay.h" #include "VideoCommon/RenderBase.h" #include "VideoCommon/VideoBackendBase.h" -#include "../../Core/Common/WindowSystemInfo.h" #include "jni/AndroidCommon/AndroidCommon.h" #include "jni/AndroidCommon/IDCache.h" @@ -521,7 +520,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Initialize(J Common::AndroidSetReportHandler(&ReportSend); DolphinAnalytics::AndroidSetGetValFunc(&GetAnalyticValue); UICommon::Init(); - GCAdapter::Init(); + UICommon::InitControllers(WindowSystemInfo(WindowSystemType::Android, nullptr, nullptr, nullptr)); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ReportStartToAnalytics(JNIEnv*, |