Fix saving settings route state on activity recration

2025-03-25 21:50:03 +01:00
parent bbf64e1522
commit d3d354d43e
1 changed files with 11 additions and 9 deletions
@@ -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
+                            }
                        }
                    }
                }