diff options
| author |  Charles Lombardo | 2023-09-14 22:20:45 -0400 |
|---|---|---|
| committer |  GitHub | 2023-09-14 22:20:45 -0400 |
| commit | 19053ab631e8359e05d72c0f01ec8696b24bd71a (patch) | |
| tree | d9666826f6a60c916f06f48c3ec6faa1637bf0bf | |
| parent | Merge pull request #11504 from t895/emu-args (diff) | |
| parent | android: Don't reinitialize settings on emulation start (diff) | |
| download | yuzu-19053ab631e8359e05d72c0f01ec8696b24bd71a.tar.gz yuzu-19053ab631e8359e05d72c0f01ec8696b24bd71a.tar.xz yuzu-19053ab631e8359e05d72c0f01ec8696b24bd71a.zip | |
Merge pull request #11505 from t895/config-patch
android: Don't reinitialize settings on emulation start
Diffstat (limited to '')
| -rw-r--r-- | src/android/app/src/main/jni/native.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/android/app/src/main/jni/native.cpp b/src/android/app/src/main/jni/native.cpp index b9ecefa74..8ac28b638 100644 --- a/src/android/app/src/main/jni/native.cpp +++ b/src/android/app/src/main/jni/native.cpp | |||
| @@ -262,9 +262,6 @@ public: | |||
| 262 | Core::SystemResultStatus InitializeEmulation(const std::string& filepath) { | 262 | Core::SystemResultStatus InitializeEmulation(const std::string& filepath) { |
| 263 | std::scoped_lock lock(m_mutex); | 263 | std::scoped_lock lock(m_mutex); |
| 264 | 264 | ||
| 265 | // Loads the configuration. | ||
| 266 | Config{}; | ||
| 267 | |||
| 268 | // Create the render window. | 265 | // Create the render window. |
| 269 | m_window = std::make_unique<EmuWindow_Android>(&m_input_subsystem, m_native_window, | 266 | m_window = std::make_unique<EmuWindow_Android>(&m_input_subsystem, m_native_window, |
| 270 | m_vulkan_library); | 267 | m_vulkan_library); |