fix: fix panic caused by removed_resource.is_none (fix #11955) (#12000)

tauri-apps · Dec 23, 2024 · e349dfe · e349dfe
1 parent fdaf48f
commit e349dfe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/.changes/fix-resource-id.md b/.changes/fix-resource-id.md
@@ -0,0 +1,5 @@
+---
+'tauri': patch:bug
+---
+
+Fixed a panic caused by an assert when the resource random id has been used already.
diff --git a/crates/tauri/src/resources/mod.rs b/crates/tauri/src/resources/mod.rs
@@ -111,7 +111,11 @@ impl ResourceTable {
   ///
   /// Returns a unique resource ID, which acts as a key for this resource.
   pub fn add_arc_dyn(&mut self, resource: Arc<dyn Resource>) -> ResourceId {
-    let rid = Self::new_random_rid();
+    let mut rid = Self::new_random_rid();
+    while self.index.contains_key(&rid) {
+      rid = Self::new_random_rid();
+    }
+
     let removed_resource = self.index.insert(rid, resource);
     assert!(removed_resource.is_none());
     rid