diff options
| author |  t895 | 2024-01-26 23:05:02 -0500 |
|---|---|---|
| committer | t895 | 2024-01-26 23:05:02 -0500 |
| commit | 6a4b25699d6a478d519a650b4e8b384873b0727b (patch) | |
| tree | de87cae5759b2fa4bb6d6312dcfea5845092351f | |
| parent | Merge pull request #12808 from t895/uri-moment (diff) | |
| download | yuzu-6a4b25699d6a478d519a650b4e8b384873b0727b.tar.gz yuzu-6a4b25699d6a478d519a650b4e8b384873b0727b.tar.xz yuzu-6a4b25699d6a478d519a650b4e8b384873b0727b.zip | |
android: Reload global settings on closing emulation
UI like the driver manager expects the global settings to be loaded when in the MainActivity so we reload global config to properly reset state on exit.
Diffstat (limited to '')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt index 22da1d0e5..ef393c4be 100644 --- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt +++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/EmulationFragment.kt | |||
| @@ -301,6 +301,7 @@ class EmulationFragment : Fragment(), SurfaceHolder.Callback { | |||
| 301 | 301 | ||
| 302 | R.id.menu_exit -> { | 302 | R.id.menu_exit -> { |
| 303 | emulationState.stop() | 303 | emulationState.stop() |
| 304 | NativeConfig.reloadGlobalConfig() | ||
| 304 | emulationViewModel.setIsEmulationStopping(true) | 305 | emulationViewModel.setIsEmulationStopping(true) |
| 305 | binding.drawerLayout.close() | 306 | binding.drawerLayout.close() |
| 306 | binding.inGameMenu.requestFocus() | 307 | binding.inGameMenu.requestFocus() |