From 83ad84061e05fd7d07998757aa3fc9622066573f Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Sat, 20 Nov 2021 19:38:09 +0100 Subject: Core/Boot: Refactor storage of boot-to-savestate data into a separate class. --- Source/Android/jni/MainAndroid.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Source/Android/jni/MainAndroid.cpp') diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index c08106ee4f..4b94996796 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -549,8 +549,7 @@ static float GetRenderSurfaceScale(JNIEnv* env) } static void Run(JNIEnv* env, const std::vector& paths, bool riivolution, - const std::optional& savestate_path = {}, - bool delete_savestate = false) + BootSessionData boot_session_data = BootSessionData()) { ASSERT(!paths.empty()); __android_log_print(ANDROID_LOG_INFO, DOLPHIN_TAG, "Running : %s", paths[0].c_str()); @@ -561,9 +560,8 @@ static void Run(JNIEnv* env, const std::vector& paths, bool riivolu s_have_wm_user_stop = false; - std::unique_ptr boot = BootParameters::GenerateFromFile(paths, savestate_path); - if (boot) - boot->delete_savestate = delete_savestate; + std::unique_ptr boot = + BootParameters::GenerateFromFile(paths, std::move(boot_session_data)); if (riivolution && std::holds_alternative(boot->parameters)) { @@ -638,8 +636,10 @@ Java_org_dolphinemu_dolphinemu_NativeLibrary_Run___3Ljava_lang_String_2ZLjava_la JNIEnv* env, jclass, jobjectArray jPaths, jboolean jRiivolution, jstring jSavestate, jboolean jDeleteSavestate) { - Run(env, JStringArrayToVector(env, jPaths), jRiivolution, GetJString(env, jSavestate), - jDeleteSavestate); + DeleteSavestateAfterBoot delete_state = + jDeleteSavestate ? DeleteSavestateAfterBoot::Yes : DeleteSavestateAfterBoot::No; + Run(env, JStringArrayToVector(env, jPaths), jRiivolution, + BootSessionData(GetJString(env, jSavestate), delete_state)); } JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ChangeDisc(JNIEnv* env, jclass, -- cgit v1.2.3