From 4b7f8b3dbdce6b9a4d1367463ed23da7e95f41e3 Mon Sep 17 00:00:00 2001 From: Adrian Wielgosik Date: Sat, 18 Sep 2021 13:24:02 +0200 Subject: [PATCH] avm2: inner_class_definition is not an Option --- core/src/avm2/object.rs | 2 +- core/src/avm2/object/class_object.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/avm2/object.rs b/core/src/avm2/object.rs index cfa023e28..01c4046bc 100644 --- a/core/src/avm2/object.rs +++ b/core/src/avm2/object.rs @@ -1091,7 +1091,7 @@ pub trait TObject<'gc>: 'gc + Collect + Debug + Into> + Clone + Copy None => return None, } }; - class.inner_class_definition() + Some(class.inner_class_definition()) } /// Get this object's class object, if it has one - unless it's a class itself. diff --git a/core/src/avm2/object/class_object.rs b/core/src/avm2/object/class_object.rs index 1470f4822..2b40ea17b 100644 --- a/core/src/avm2/object/class_object.rs +++ b/core/src/avm2/object/class_object.rs @@ -344,8 +344,8 @@ impl<'gc> ClassObject<'gc> { Ok(()) } - pub fn inner_class_definition(self) -> Option>> { - Some(self.0.read().class) + pub fn inner_class_definition(self) -> GcCell<'gc, Class<'gc>> { + self.0.read().class } pub fn interfaces(self) -> Vec> {