Skip to content
Permalink
Browse files
Merge pull request #10877 from JosJuice/android-real-wiimote-early
Android: Call WiimoteReal::InitAdapterClass before controller init
  • Loading branch information
JosJuice committed Jul 20, 2022
2 parents b0b5faa + 01e4ce5 commit 559f5a6
Showing 1 changed file with 2 additions and 2 deletions.
@@ -519,6 +519,8 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Initialize(J
Common::RegisterMsgAlertHandler(&MsgAlert);
Common::AndroidSetReportHandler(&ReportSend);
DolphinAnalytics::AndroidSetGetValFunc(&GetAnalyticValue);

WiimoteReal::InitAdapterClass();
UICommon::Init();
UICommon::InitControllers(WindowSystemInfo(WindowSystemType::Android, nullptr, nullptr, nullptr));
}
@@ -549,8 +551,6 @@ static void Run(JNIEnv* env, std::unique_ptr<BootParameters>&& boot, bool riivol
{
std::unique_lock<std::mutex> host_identity_guard(s_host_identity_lock);

WiimoteReal::InitAdapterClass();

if (riivolution && std::holds_alternative<BootParameters::Disc>(boot->parameters))
{
const std::string& riivolution_dir = File::GetUserPath(D_RIIVOLUTION_IDX);

0 comments on commit 559f5a6

Please sign in to comment.