liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Further adjustments that fell through before.

This commit is contained in:
David Wendt 2020-08-01 16:11:11 -04:00
parent 4dbd26807e
commit 8cb6e4af39
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/avm1/object.rs
View File

@ -117,7 +117,7 @@ pub trait TObject<'gc>: 'gc + Collect + Debug + Into<Object<'gc>> + Clone + Copy
/// Takes an already existing object and performs this constructor (if valid) on it. /// Takes an already existing object and performs this constructor (if valid) on it.
fn construct_on_existing( fn construct_on_existing(
&self, &self,
activation: &mut Activation<'_, 'gc, '_>, _activation: &mut Activation<'_, 'gc, '_>,
mut _this: Object<'gc>, mut _this: Object<'gc>,
_args: &[Value<'gc>], _args: &[Value<'gc>],
) -> Result<(), Error<'gc>> { ) -> Result<(), Error<'gc>> {

2
core/src/display_object/movie_clip.rs
View File

@ -1159,7 +1159,7 @@ impl<'gc> TDisplayObject<'gc> for MovieClip<'gc> {
} }
} }
} }
self.0.write(context.gc_context).object = Some(object); self.0.write(activation.context.gc_context).object = Some(object);
let _ = constructor.construct_on_existing(&mut activation, object, &[]); let _ = constructor.construct_on_existing(&mut activation, object, &[]);
} }