fix race conditions (#160)

-
hyprutils · Dec 8, 2024 · 888db72 · 888db72
1 parent b8efef5
commit 888db72
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 26 deletions.
diff --git a/src/search.rs b/src/search.rs
@@ -88,10 +88,7 @@ pub async fn search_applications(
         let cache = APP_CACHE.blocking_read();
 
         if SEARCH_GENERATION.load(Ordering::SeqCst) != current_gen + 1 {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "Search superseded",
-            ));
+            return Ok::<Vec<SearchResult>, std::io::Error>(Vec::new());
         }
 
         let results = match query.chars().next() {
@@ -262,18 +259,15 @@ pub async fn search_applications(
         };
 
         if SEARCH_GENERATION.load(Ordering::SeqCst) != current_gen + 1 {
-            return Err(std::io::Error::new(
-                std::io::ErrorKind::Other,
-                "Search superseded",
-            ));
+            return Ok::<Vec<SearchResult>, std::io::Error>(Vec::new());
         }
 
-        tx.send(results)
-            .map_err(|_| std::io::Error::new(std::io::ErrorKind::Other, "Failed to send results"))
+        tx.send(results).ok();
+        Ok::<Vec<SearchResult>, std::io::Error>(Vec::new())
     });
 
     rx.await
-        .map_err(|_| std::io::Error::new(std::io::ErrorKind::Other, "Failed to receive results"))
+        .map_err(|_| std::io::Error::new(std::io::ErrorKind::Other, "Search cancelled"))
 }
 
 #[inline(always)]

diff --git a/src/ui.rs b/src/ui.rs
@@ -798,21 +798,24 @@ fn update_results_list(
 
             model.remove_all();
             store.clear();
-            store.reserve(max_entries);
-
-            let results = if results.len() > max_entries {
-                &results[..max_entries]
-            } else {
-                &results
-            };
-
-            store.extend(results.iter().map(|r| r.app.clone()));
-            model.extend_from_slice(
-                &results
-                    .iter()
-                    .map(|r| AppEntryObject::new(r.app.clone()))
-                    .collect::<Vec<_>>(),
-            );
+
+            if !results.is_empty() {
+                store.reserve(max_entries);
+
+                let results = if results.len() > max_entries {
+                    &results[..max_entries]
+                } else {
+                    &results
+                };
+
+                store.extend(results.iter().map(|r| r.app.clone()));
+                model.extend_from_slice(
+                    &results
+                        .iter()
+                        .map(|r| AppEntryObject::new(r.app.clone()))
+                        .collect::<Vec<_>>(),
+                );
+            }
         }
     }
 }