Merge branch '313ctric/master'

jiegec · Dec 20, 2023 · 612ec97 · 612ec97
2 parents f9246c0 + e968c27
commit 612ec97
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -319,10 +319,9 @@ pub async fn handler<T: AsyncReadExt + AsyncWriteExt + Unpin>(
 
                 let mut used_devices = server.used_devices.write().await;
                 let mut available_devices = server.available_devices.write().await;
+                let busid_compare = &busid[..busid.iter().position(|&x| x == 0).unwrap_or(busid.len())];
                 for (i, dev) in available_devices.iter().enumerate() {
-                    let mut expected = dev.bus_id.as_bytes().to_vec();
-                    expected.resize(32, 0);
-                    if expected.as_slice() == busid {
+                    if busid_compare == dev.bus_id.as_bytes() {
                         let dev = available_devices.remove(i);
                         let dev_id = dev.bus_id.clone();
                         used_devices.insert(dev.bus_id.clone(), dev);