From d17c577ccd74b9c8a686247dca3864e0e685a0f4 Mon Sep 17 00:00:00 2001
From: Logan McNaughton <848146+loganmc10@users.noreply.github.com>
Date: Thu, 14 May 2026 21:55:42 +0200
Subject: [PATCH] use port 48646 for UNFloader (#890)

---
 src/ui/usb.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/ui/usb.rs b/src/ui/usb.rs
index 11c09862..1e0a14f2 100644
--- a/src/ui/usb.rs
+++ b/src/ui/usb.rs
@@ -145,23 +145,23 @@ pub fn init() -> (
     let usb_tx_clone = usb_tx.clone();
     let cart_rx_clone = cart_rx.resubscribe();
     let handle = tokio::spawn(async move {
-        let listener = tokio::net::TcpListener::bind("localhost:64000")
-            .await
-            .unwrap();
-
-        loop {
-            tokio::select! {
-                res = listener.accept() => {
-                    if let Ok((c,_)) = res {
-                        handle_connection(c,shutdown_rx.clone(),usb_rx.resubscribe(),usb_tx.clone(),cart_tx.clone()).await;
-                    } else {
+        if let Ok(listener) = tokio::net::TcpListener::bind("localhost:48646").await {
+            loop {
+                tokio::select! {
+                    res = listener.accept() => {
+                        if let Ok((c,_)) = res {
+                            handle_connection(c,shutdown_rx.clone(),usb_rx.resubscribe(),usb_tx.clone(),cart_tx.clone()).await;
+                        } else {
+                            break;
+                        }
+                    }
+                    _ = shutdown_rx.changed() => {
                         break;
                     }
                 }
-                _ = shutdown_rx.changed() => {
-                    break;
-                }
             }
+        } else {
+            eprintln!("Could not bind to port 48646");
         }
     });
     (