From cc315379c52e194a729df24b21554876ddb0cdfd Mon Sep 17 00:00:00 2001 From: twinaphex Date: Sat, 2 Nov 2013 18:32:15 +0100 Subject: [PATCH] (Android) Fixes core library being passed from Java frontend to native library --- frontend/frontend_android.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/frontend/frontend_android.c b/frontend/frontend_android.c index f3a670d646..9bb8f693e2 100644 --- a/frontend/frontend_android.c +++ b/frontend/frontend_android.c @@ -96,12 +96,6 @@ static bool android_app_start_main(struct android_app *android_app) strlcpy(out_args.in, "ROM", sizeof(out_args.in)); jni_get(&in_params, &out_args); - // libretro - out_args.out = g_settings.libretro; - out_args.out_sizeof = sizeof(g_settings.libretro); - strlcpy(out_args.in, "LIBRETRO", sizeof(out_args.in)); - jni_get(&in_params, &out_args); - // Config file out_args.out = g_extern.config_path; out_args.out_sizeof = sizeof(g_extern.config_path); @@ -114,18 +108,27 @@ static bool android_app_start_main(struct android_app *android_app) strlcpy(out_args.in, "IME", sizeof(out_args.in)); jni_get(&in_params, &out_args); - (*in_params.java_vm)->DetachCurrentThread(in_params.java_vm); - RARCH_LOG("Checking arguments passed ...\n"); RARCH_LOG("ROM Filename: [%s].\n", g_extern.fullpath); - RARCH_LOG("Libretro path: [%s].\n", g_settings.libretro); RARCH_LOG("Config file: [%s].\n", g_extern.config_path); RARCH_LOG("Current IME: [%s].\n", android_app->current_ime); config_load(); + // libretro + out_args.out = g_settings.libretro; + out_args.out_sizeof = sizeof(g_settings.libretro); + strlcpy(out_args.in, "LIBRETRO", sizeof(out_args.in)); + jni_get(&in_params, &out_args); + + RARCH_LOG("Checking arguments passed ...\n"); + RARCH_LOG("Libretro path: [%s].\n", g_settings.libretro); + + (*in_params.java_vm)->DetachCurrentThread(in_params.java_vm); + menu_init(); + ret = load_menu_game(); if (ret) g_extern.lifecycle_mode_state |= (1ULL << MODE_GAME);