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

The class function should use the *instance* initializer as it's callable, not the class initializer.

This commit is contained in:
David Wendt 2020-02-24 14:41:09 -05:00
parent bedf5cb459
commit 9431e02802
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/avm2/function.rs
View File

@ -290,12 +290,13 @@ impl<'gc> FunctionObject<'gc> {
class_proto.install_trait(avm, context, class.abc(), trait_entry, scope, fn_proto)?; class_proto.install_trait(avm, context, class.abc(), trait_entry, scope, fn_proto)?;
} }
let initializer_index = class.class().init_method.clone(); // TODO: Get the class initializer, and store it somewhere.
let initializer_index = class.instance().init_method.clone();
let initializer: Result<Avm2MethodEntry, Error> = let initializer: Result<Avm2MethodEntry, Error> =
Avm2MethodEntry::from_method_index(class.abc(), initializer_index.clone()).ok_or_else( Avm2MethodEntry::from_method_index(class.abc(), initializer_index.clone()).ok_or_else(
|| { || {
format!( format!(
"Class initializer method index {} does not exist", "Instance initializer method index {} does not exist",
initializer_index.0 initializer_index.0
) )
.into() .into()