compiler: Fix bug in snapshotting

Do not `take` an ElementRc to move it into the `Component`'s `root_element`. @ogoffart spotted this! Thanks!
slint-ui · Jul 5, 2024 · 4b42e42 · 4b42e42
1 parent 5dfa8d5
commit 4b42e42
Show file tree

Hide file tree

Showing 3 changed files with 267 additions and 154 deletions.
diff --git a/internal/compiler/namedreference.rs b/internal/compiler/namedreference.rs
@@ -183,7 +183,7 @@ impl NamedReferenceInner {
 
     pub(crate) fn snapshot(&self, snapshotter: &mut crate::typeloader::Snapshotter) -> Self {
         let element = if let Some(el) = self.element.upgrade() {
-            Rc::downgrade(&snapshotter.snapshot_element(&el))
+            Rc::downgrade(&snapshotter.use_element(&el))
         } else {
             std::rc::Weak::default()
         };

diff --git a/internal/compiler/object_tree.rs b/internal/compiler/object_tree.rs
@@ -2615,7 +2615,12 @@ impl Exports {
                 let en = en.clone();
                 let either = match either {
                     itertools::Either::Left(l) => {
-                        itertools::Either::Left(snapshotter.snapshot_component(l))
+                        itertools::Either::Left(if !snapshotter.has_component(l) {
+                            snapshotter.create_component(l)
+                        } else {
+                            Weak::upgrade(&snapshotter.use_component(l))
+                                .expect("Component should cleanly upgrade here")
+                        })
                     }
                     itertools::Either::Right(r) => itertools::Either::Right(r.clone()),
                 };