From 1320d71f3c23ddc4428f4b1fb1767eb2c9fc77bd Mon Sep 17 00:00:00 2001
From: forkless <forkless@users.noreply.github.com>
Date: Sun, 31 May 2026 19:20:56 +0200
Subject: [PATCH] Fix scan thread hang on panic, update changelog

---
 CHANGELOG.md | 1 +
 src/main.rs  | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de8e049..5f4ec3c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -33,6 +33,7 @@ All notable changes to NotAlterra are documented in this file.
 - MIT License and README with build, usage, and unpack instructions
 
 ### Fixed
+- Background scan thread panic no longer hangs the application
 - Arrow-key navigation no longer overshoots — `KeyEventKind::Release` events filtered
 - GVAS metadata popup renders all 11 fields (was clipped to 2 because of `Paragraph::new(Span)`)
 - Header path now shows tail of path (e.g. `…\Subnautica2\Saved\SaveGames`) instead of truncated prefix
diff --git a/src/main.rs b/src/main.rs
index 9ca3e08..4f07418 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -323,8 +323,10 @@ fn action_locate_saves<B: Backend>(terminal: &mut Terminal<B>, app: &mut App) ->
             );
         })?;
 
-        if let Ok(f) = rx.try_recv() {
-            break f;
+        match rx.try_recv() {
+            Ok(f) => break f,
+            Err(std::sync::mpsc::TryRecvError::Disconnected) => break Vec::new(),
+            _ => {}
         }
         std::thread::sleep(std::time::Duration::from_millis(100));
     };