From fb58a3262c78189b937ecbedc5eb3f0e12666bad Mon Sep 17 00:00:00 2001
From: just-stuff-tm <centretruckingllc@gmail.com>
Date: Thu, 5 Mar 2026 02:50:38 -0500
Subject: [PATCH] addressed codex review cleanup

---
 lib/screens/scanner_screen.dart             | 3 +++
 lib/services/usb_serial_service_native.dart | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/lib/screens/scanner_screen.dart b/lib/screens/scanner_screen.dart
index 5d7695c..45fd3fb 100644
--- a/lib/screens/scanner_screen.dart
+++ b/lib/screens/scanner_screen.dart
@@ -33,9 +33,12 @@ class _ScannerScreenState extends State<ScannerScreen> {
     _connector = Provider.of<MeshCoreConnector>(context, listen: false);
 
     _connectionListener = () {
+      final isCurrentRoute = ModalRoute.of(context)?.isCurrent ?? true;
       if (_connector.state == MeshCoreConnectionState.disconnected) {
         _changedNavigation = false;
       } else if (_connector.state == MeshCoreConnectionState.connected &&
+          _connector.activeTransport == MeshCoreTransportType.bluetooth &&
+          isCurrentRoute &&
           !_changedNavigation) {
         _changedNavigation = true;
         if (mounted) {
diff --git a/lib/services/usb_serial_service_native.dart b/lib/services/usb_serial_service_native.dart
index f758a1f..69ed5b8 100644
--- a/lib/services/usb_serial_service_native.dart
+++ b/lib/services/usb_serial_service_native.dart
@@ -344,10 +344,6 @@ class UsbSerialService {
     // with a dangling NativeCallable pointer.
     if (_useDesktopFlSerial) {
       final serial = _serial;
-      _serial = null;
-      _status = UsbSerialStatus.disconnected;
-      _connectedPortKey = null;
-      _connectedPortLabel = null;
       try {
         if (serial?.isOpen() == FlOpenStatus.open) {
           serial?.closePort(); // synchronous C call — kills the SerialThread