VERY experimental Nintendo Switch 2 emulator
C++
android: Fix incorrect assumption for driver installation validation
Charles Lombardoa8aaa2674c98
diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.ktindex 10b1d35476..df21d74b2c 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/fragments/DriverManagerFragment.kt@@ -26,6 +26,7 @@ import org.yuzu.yuzu_emu.model.DriverViewModelimport org.yuzu.yuzu_emu.model.HomeViewModelimport org.yuzu.yuzu_emu.utils.FileUtilimport org.yuzu.yuzu_emu.utils.GpuDriverHelper+import java.io.Fileimport java.io.IOExceptionclass DriverManagerFragment : Fragment() {@@ -154,29 +155,29 @@ class DriverManagerFragment : Fragment() {R.string.installing_driver,false) {+ val driverPath =+ "${GpuDriverHelper.driverStoragePath}/${FileUtil.getFilename(result)}"+ val driverFile = File(driverPath)+// Ignore file exceptions when a user selects an invalid ziptry {- GpuDriverHelper.copyDriverToInternalStorage(result)+ if (!GpuDriverHelper.copyDriverToInternalStorage(result)) {+ throw IOException("Driver failed validation!")+ }} catch (_: IOException) {+ if (driverFile.exists()) {+ driverFile.delete()+ }return@newInstance getString(R.string.select_gpu_driver_error)}- val driverData = GpuDriverHelper.customDriverData- if (driverData.name == null) {- return@newInstance getString(R.string.select_gpu_driver_error)- }-+ val driverData = GpuDriverHelper.getMetadataFromZip(driverFile)val driverInList =driverViewModel.driverList.value.firstOrNull { it.second == driverData }if (driverInList != null) {return@newInstance getString(R.string.driver_already_installed)} else {- driverViewModel.addDriver(- Pair(- "${GpuDriverHelper.driverStoragePath}/${FileUtil.getFilename(result)}",- driverData- )- )+ driverViewModel.addDriver(Pair(driverPath, driverData))driverViewModel.setNewDriverInstalled(true)}return@newInstance Any()