Browse Source

Merge pull request #11616 from t895/save-error

android: Correctly reload settings file during reset
Charles Lombardo 2 years ago
parent
commit
18b240c071

+ 2 - 1
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 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() {
         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,