summaryrefslogtreecommitdiffstats
path: root/src/android/app
diff options
context:
space:
mode:
authorCharles Lombardo <clombardo169@gmail.com>2023-09-27 16:51:05 +0200
committerGitHub <noreply@github.com>2023-09-27 16:51:05 +0200
commit18b240c0714ebffe2620d6f70de7ff316fa2a3ad (patch)
tree3469ed2be448b66184848662a8df025b8dc9d63a /src/android/app
parentMerge pull request #11603 from t895/consolidate-installs (diff)
parentandroid: Correctly reload settings file during reset (diff)
downloadyuzu-18b240c0714ebffe2620d6f70de7ff316fa2a3ad.tar
yuzu-18b240c0714ebffe2620d6f70de7ff316fa2a3ad.tar.gz
yuzu-18b240c0714ebffe2620d6f70de7ff316fa2a3ad.tar.bz2
yuzu-18b240c0714ebffe2620d6f70de7ff316fa2a3ad.tar.lz
yuzu-18b240c0714ebffe2620d6f70de7ff316fa2a3ad.tar.xz
yuzu-18b240c0714ebffe2620d6f70de7ff316fa2a3ad.tar.zst
yuzu-18b240c0714ebffe2620d6f70de7ff316fa2a3ad.zip
Diffstat (limited to 'src/android/app')
-rw-r--r--src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
index ea26a21d0..c73edd50e 100644
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt
@@ -21,6 +21,7 @@ import androidx.navigation.navArgs
import com.google.android.material.color.MaterialColors
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
+import org.yuzu.yuzu_emu.NativeLibrary
import java.io.IOException
import org.yuzu.yuzu_emu.R
import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
@@ -168,7 +169,7 @@ class SettingsActivity : AppCompatActivity() {
if (!settingsFile.delete()) {
throw IOException("Failed to delete $settingsFile")
}
- Settings.settingsList.forEach { it.reset() }
+ NativeLibrary.reloadSettings()
Toast.makeText(
applicationContext,