fix dropping current screen with navigation

app/src/main/java/com/isidroid/c23/ui/navigation/AppNavHost.kt

 package com.isidroid.c23.ui.navigation
 package com.isidroid.c23.ui.navigation
 
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.NavHostController
 import androidx.navigation.NavType
 import androidx.navigation.NavType
@@ -15,6 +16,7 @@ import com.isidroid.c23.ui.navigation.destinations.JobDetailsDestination
 import com.isidroid.c23.ui.navigation.destinations.MapScreenDestination
 import com.isidroid.c23.ui.navigation.destinations.MapScreenDestination
 import com.isidroid.c23.ui.navigation.destinations.PrintJobsScreenDestination
 import com.isidroid.c23.ui.navigation.destinations.PrintJobsScreenDestination
 import com.isidroid.c23.ui.navigation.destinations.RenderScreenDestination
 import com.isidroid.c23.ui.navigation.destinations.RenderScreenDestination
+import timber.log.Timber
 
 
 @Composable
 @Composable
 fun AppNavHost(
 fun AppNavHost(

core/core/src/main/java/com/isidroid/core/ext/ExtNavigation.kt

@@ -16,10 +16,10 @@ fun NavController.navigateSingleTopTo(
     isInclusive: Boolean = true,
     isInclusive: Boolean = true,
     popupToRoute: String? = null
     popupToRoute: String? = null
 ) {
 ) {
-    navigate(route) {
-        val dropNode = if (dropCurrent) currentDestination?.route else popupToRoute
-        val node = dropNode?.let { graph.findNode(popupToRoute) } ?: graph.findStartDestination()
+    val dropNode = if (dropCurrent) currentDestination?.route else popupToRoute
+    val node = dropNode?.let { graph.findNode(dropNode) } ?: graph.findStartDestination()
 
 
+    navigate(route) {
         popUpTo(node.id) {
         popUpTo(node.id) {
             inclusive = isInclusive
             inclusive = isInclusive
             if (isSaveState != null)
             if (isSaveState != null)