From 24215a8b31f2c9342e5f1bcc64b88240987be78e Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Tue, 18 Apr 2023 13:53:40 +0200
Subject: [PATCH] Fix crash when default volume gets deleted

---
 .../main/java/sushi/hardcore/droidfs/MainActivity.kt   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/sushi/hardcore/droidfs/MainActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/MainActivity.kt
index d20f49e..305c214 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/MainActivity.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/MainActivity.kt
@@ -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()
                 }
             }
         }