avm1: When unloading a button, also unload its children

ruffle-rs · Nov 9, 2024 · 50df827 · 50df827
1 parent 99f6b22
commit 50df827
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/core/src/display_object/avm1_button.rs b/core/src/display_object/avm1_button.rs
@@ -393,7 +393,12 @@ impl<'gc> TDisplayObject<'gc> for Avm1Button<'gc> {
     }
 
     fn avm1_unload(&self, context: &mut UpdateContext<'gc>) {
+        for child in self.iter_render_list() {
+            child.avm1_unload(context);
+        }
+
         self.drop_focus(context);
+
         if let Some(node) = self.maskee() {
             node.set_masker(context.gc(), None, true);
         } else if let Some(node) = self.masker() {

diff --git a/tests/tests/swfs/avm1/movieclip_in_removed_button/output.txt b/tests/tests/swfs/avm1/movieclip_in_removed_button/output.txt
@@ -0,0 +1,4 @@
+_level0.button.instance1.onEnterFrame
+_level0.button
+undefined
+undefined
diff --git a/tests/tests/swfs/avm1/movieclip_in_removed_button/test.fla b/tests/tests/swfs/avm1/movieclip_in_removed_button/test.fla
diff --git a/tests/tests/swfs/avm1/movieclip_in_removed_button/test.swf b/tests/tests/swfs/avm1/movieclip_in_removed_button/test.swf
diff --git a/tests/tests/swfs/avm1/movieclip_in_removed_button/test.toml b/tests/tests/swfs/avm1/movieclip_in_removed_button/test.toml
@@ -0,0 +1 @@
+num_frames = 4