Skip to content
Snippets Groups Projects
Unverified Commit 18b240c0 authored by Charles Lombardo's avatar Charles Lombardo Committed by GitHub
Browse files

Merge pull request #11616 from t895/save-error

android: Correctly reload settings file during reset
parents 0aa99b8f 481f91cc
No related branches found
No related tags found
No related merge requests found
...@@ -21,6 +21,7 @@ import androidx.navigation.navArgs ...@@ -21,6 +21,7 @@ import androidx.navigation.navArgs
import com.google.android.material.color.MaterialColors import com.google.android.material.color.MaterialColors
import kotlinx.coroutines.flow.collectLatest import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
import org.yuzu.yuzu_emu.NativeLibrary
import java.io.IOException import java.io.IOException
import org.yuzu.yuzu_emu.R import org.yuzu.yuzu_emu.R
import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding import org.yuzu.yuzu_emu.databinding.ActivitySettingsBinding
...@@ -168,7 +169,7 @@ class SettingsActivity : AppCompatActivity() { ...@@ -168,7 +169,7 @@ class SettingsActivity : AppCompatActivity() {
if (!settingsFile.delete()) { if (!settingsFile.delete()) {
throw IOException("Failed to delete $settingsFile") throw IOException("Failed to delete $settingsFile")
} }
Settings.settingsList.forEach { it.reset() } NativeLibrary.reloadSettings()
Toast.makeText( Toast.makeText(
applicationContext, applicationContext,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment