Skip to content

Commit 7ec3889

Browse files
nivknerLord-McSweeney
authored andcommitted
core: Move cleanup queue clearing to run_inner_goto_frame
1 parent bd57f81 commit 7ec3889

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

core/src/display_object/movie_clip.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -744,12 +744,6 @@ impl<'gc> MovieClip<'gc> {
744744
self.play();
745745
}
746746

747-
if self.swf_version() >= 10 {
748-
// When performing goto, frame scripts behave the same as when entering a new frame
749-
// so no separate cleanup is performed on ones registered during frame script phase
750-
context.frame_script_cleanup_queue.clear();
751-
}
752-
753747
// Clamp frame number in bounds.
754748
let frame = frame.max(1);
755749

core/src/frame_lifecycle.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,10 @@ pub fn run_inner_goto_frame<'gc>(
145145
let stage = context.stage;
146146
let old_phase = *context.frame_phase;
147147

148+
// When performing goto, frame scripts behave the same as when entering a new frame
149+
// so no separate cleanup is performed on ones registered during frame script phase
150+
context.frame_script_cleanup_queue.clear();
151+
148152
// Note - we do *not* call `enter_frame` or dispatch an `enterFrame` event
149153

150154
*context.frame_phase = FramePhase::Construct;

0 commit comments

Comments
 (0)