VERY experimental Nintendo Switch 2 emulator
C++
[android,ui] driver management: fixed driver add/removal unsync (#3757)
xbzkf0d77e86e34c
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 877097dc80..3aa55522e6 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@@ -29,7 +29,6 @@ import org.yuzu.yuzu_emu.databinding.FragmentDriverManagerBindingimport org.yuzu.yuzu_emu.features.settings.model.Settingsimport org.yuzu.yuzu_emu.features.settings.model.StringSettingimport org.yuzu.yuzu_emu.features.settings.ui.SettingsSubscreen-import org.yuzu.yuzu_emu.model.Driver.Companion.toDriverimport org.yuzu.yuzu_emu.model.DriverViewModelimport org.yuzu.yuzu_emu.model.HomeViewModelimport org.yuzu.yuzu_emu.utils.FileUtil@@ -216,19 +215,23 @@ class DriverManagerFragment : Fragment() {val driverData = GpuDriverHelper.getMetadataFromZip(driverFile)val driverInList =- driverViewModel.driverData.firstOrNull { it.second == driverData }+ driverViewModel.driverData.firstOrNull {+ it.first == driverPath || it.second == driverData+ }if (driverInList != null) {return@newInstance getString(R.string.driver_already_installed)} else {driverViewModel.onDriverAdded(Pair(driverPath, driverData))withContext(Dispatchers.Main) {if (_binding != null) {+ refreshDriverList()val adapter = binding.listDrivers.adapter as DriverAdapter- adapter.addItem(driverData.toDriver())- adapter.selectItem(adapter.currentList.indices.last)+ val selectedPosition = adapter.currentList+ .indexOfFirst { it.selected }+ .let { if (it == -1) 0 else it }driverViewModel.showClearButton(!StringSetting.DRIVER_PATH.global)binding.listDrivers- .smoothScrollToPosition(adapter.currentList.indices.last)+ .smoothScrollToPosition(selectedPosition)}}}diff --git a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.ktindex fc7fbc9bfc..3904f83279 100644--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/model/DriverViewModel.kt@@ -154,15 +154,30 @@ class DriverViewModel : ViewModel() {}fun onDriverRemoved(removedPosition: Int, selectedPosition: Int) {- driversToDelete.add(driverData[removedPosition - 1].first)- driverData.removeAt(removedPosition - 1)- onDriverSelected(selectedPosition)+ val driverIndex = removedPosition - 1+ if (driverIndex !in driverData.indices) {+ updateDriverList()+ return+ }++ driversToDelete.add(driverData[driverIndex].first)+ driverData.removeAt(driverIndex)+ val safeSelectedPosition = selectedPosition.coerceIn(0, driverData.size)+ onDriverSelected(safeSelectedPosition)}fun onDriverAdded(driver: Pair<String, GpuDriverMetadata>) {if (driversToDelete.contains(driver.first)) {driversToDelete.remove(driver.first)}++ val existingDriverIndex = driverData.indexOfFirst {+ it.first == driver.first || it.second == driver.second+ }+ if (existingDriverIndex != -1) {+ onDriverSelected(existingDriverIndex + 1)+ return+ }driverData.add(driver)onDriverSelected(driverData.size)}