From c8f54de980af5a7f484595fbba94669df2dc60a6 Mon Sep 17 00:00:00 2001
From: Juha Heinanen <jh@tutpro.com>
Date: Sun, 19 Jul 2026 21:36:45 +0300
Subject: [PATCH] Do not create new navigation instance if already on chat,
 chats or calls screen

---
 app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
index 1fbb4e17..880f797b 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/MainActivity.kt
@@ -250,15 +250,14 @@ class MainActivity : ComponentActivity() {
                         when (command) {
                             is NavigationCommand.NavigateToChat -> {
                                 val route = "chat/${command.aor}/${command.peerUri}"
-                                navController.navigate(route)
+                                navController.navigate(route) { launchSingleTop = true }
                             }
                             is NavigationCommand.NavigateToCalls -> {
                                 val route = "calls/${command.aor}"
-                                navController.navigate(route)
-                            }
-                            is NavigationCommand.NavigateToChats -> {
-                                navController.navigate("chats")
+                                navController.navigate(route) { launchSingleTop = true }
                             }
+                            is NavigationCommand.NavigateToChats ->
+                                navController.navigate("chats") { launchSingleTop = true }
                             is NavigationCommand.NavigateToHome ->
                                 navController.navigate("main") {
                                     popUpTo("main") { inclusive = true }