diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-06-06 16:51:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-06 16:51:43 +0200 |
| commit | 591aade9361be61ff51764ad0ad23999706eb0c6 (patch) | |
| tree | 3460c922ef3d82eedd4ae39f94abd0af702417b3 /Source/Android/jni/MainAndroid.cpp | |
| parent | 096399d3719769dde4004bcefec87a447fd32cf3 (diff) | |
| parent | d50b4406a66f1d9e09ad095df38fae9d57a3a729 (diff) | |
Merge pull request #5492 from leoetlino/boot-cleanup
Clean up the boot code
Diffstat (limited to 'Source/Android/jni/MainAndroid.cpp')
| -rw-r--r-- | Source/Android/jni/MainAndroid.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Android/jni/MainAndroid.cpp b/Source/Android/jni/MainAndroid.cpp index 9d3dff94c4..350b78b361 100644 --- a/Source/Android/jni/MainAndroid.cpp +++ b/Source/Android/jni/MainAndroid.cpp @@ -25,6 +25,7 @@ #include "Common/Logging/LogManager.h" #include "Common/MsgHandler.h" +#include "Core/Boot/Boot.h" #include "Core/BootManager.h" #include "Core/ConfigManager.h" #include "Core/Core.h" @@ -794,7 +795,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Run(JNIEnv* // No use running the loop when booting fails s_have_wm_user_stop = false; - if (BootManager::BootCore(s_filename.c_str(), SConfig::BOOT_DEFAULT)) + if (BootManager::BootCore(BootParameters::GenerateFromFile(s_filename))) { static constexpr int TIMEOUT = 10000; static constexpr int WAIT_STEP = 25; |