Fix crash when default volume gets deleted

This commit is contained in:
Matéo Duparc 2023-04-18 13:53:40 +02:00
parent eb4e13af46
commit 24215a8b31
Signed by untrusted user: hardcoresushi
GPG Key ID: AFE384344A45E13A

View File

@ -118,13 +118,13 @@ class MainActivity : BaseActivity(), VolumeAdapter.Listener {
volumeOpener.defaultVolumeName?.let { name ->
val state = savedInstanceState?.getBoolean(OPEN_DEFAULT_VOLUME)
if (state == true || state == null) {
val volumeData = volumeAdapter.volumes.first { it.name == name }
if (!volumeManager.isOpen(volumeData)) {
try {
try {
val volumeData = volumeAdapter.volumes.first { it.name == name }
if (!volumeManager.isOpen(volumeData)) {
openVolume(volumeData)
} catch (e: NoSuchElementException) {
unsetDefaultVolume()
}
} catch (e: NoSuchElementException) {
unsetDefaultVolume()
}
}
}