From cce115d2d86da8f901b0d5fb96300691bb8dad50 Mon Sep 17 00:00:00 2001
From: Ellen Poe <ellen.poe.ext@murena.com>
Date: Thu, 4 Dec 2025 12:32:53 -0800
Subject: [PATCH] fix: properly stop the navigation session

---
 .../cardinal/ui/directions/TurnByTurnNavigationScreen.kt  | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/directions/TurnByTurnNavigationScreen.kt b/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/directions/TurnByTurnNavigationScreen.kt
index e8e8e0f..6c107ba 100644
--- a/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/directions/TurnByTurnNavigationScreen.kt
+++ b/cardinal-android/app/src/main/java/earth/maps/cardinal/ui/directions/TurnByTurnNavigationScreen.kt
@@ -25,7 +25,6 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -84,10 +83,15 @@ fun TurnByTurnNavigationScreen(
         }
 
         // Start navigation when a route is provided
-        LaunchedEffect(route) {
+        DisposableEffect(route) {
             route?.let {
                 ferrostarCore.startNavigation(route = it)
             }
+            onDispose {
+                route?.let {
+                    ferrostarCore.stopNavigation()
+                }
+            }
         }
 
         // TODO: Make this configurable.
-- 
GitLab