From df25d1ca8b9edc4a326e546d9bc857a86c144b84 Mon Sep 17 00:00:00 2001 From: David Wendt Date: Sat, 15 Jan 2022 19:00:09 -0500 Subject: [PATCH] avm2: Children of the root inherit their parent's `loaderInfo` --- core/src/avm2/globals/flash/display/displayobject.rs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/core/src/avm2/globals/flash/display/displayobject.rs b/core/src/avm2/globals/flash/display/displayobject.rs index 2ef8339fe..ac2215925 100644 --- a/core/src/avm2/globals/flash/display/displayobject.rs +++ b/core/src/avm2/globals/flash/display/displayobject.rs @@ -565,14 +565,12 @@ pub fn loader_info<'gc>( ) -> Result, Error> { if let Some(dobj) = this.and_then(|this| this.as_display_object()) { if let Some(root) = dobj.avm2_root(&mut activation.context) { - if DisplayObject::ptr_eq(root, dobj) { - let movie = dobj.movie(); + let movie = dobj.movie(); - if let Some(movie) = movie { - let obj = LoaderInfoObject::from_movie(activation, movie, root)?; + if let Some(movie) = movie { + let obj = LoaderInfoObject::from_movie(activation, movie, root)?; - return Ok(obj.into()); - } + return Ok(obj.into()); } }