diff options
| author | Charles Lombardo <clombardo169@gmail.com> | 2023-09-27 10:51:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-27 10:51:05 -0400 |
| commit | 18b240c0714ebffe2620d6f70de7ff316fa2a3ad (patch) | |
| tree | 3469ed2be448b66184848662a8df025b8dc9d63a /src | |
| parent | 0aa99b8f472585800bd6e4ff8ab24dc82c5c5c7d (diff) | |
| parent | 481f91cc345f3929530e1de33c607fe28e6221a2 (diff) | |
Merge pull request #11616 from t895/save-error
android: Correctly reload settings file during reset
Diffstat (limited to 'src')
| -rw-r--r-- | src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/ui/SettingsActivity.kt | 3 |
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, |