From d3d354d43eb8baedd0bd6b45c2c02680ef98e720 Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Tue, 25 Mar 2025 21:50:03 +0100
Subject: [PATCH] Fix saving settings route state on activity recration

---
 .../launcher2/ui/settings/SettingsActivity.kt | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt
index 08ff431e..2afddb4e 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/SettingsActivity.kt
@@ -92,16 +92,18 @@ class SettingsActivity : BaseActivity() {
             val navController = rememberNavController()
 
             LaunchedEffect(route) {
-                try {
-                    navController.navigate(route ?: "settings") {
-                        popUpTo("settings") {
-                            inclusive = true
+                if (route != null) {
+                    try {
+                        navController.navigate(route ?: "settings") {
+                            popUpTo("settings") {
+                                inclusive = true
+                            }
                         }
-                    }
-                } catch (e: IllegalArgumentException) {
-                    navController.navigate("settings") {
-                        popUpTo("settings") {
-                            inclusive = true
+                    } catch (e: IllegalArgumentException) {
+                        navController.navigate("settings") {
+                            popUpTo("settings") {
+                                inclusive = true
+                            }
                         }
                     }
                 }