From bc0897106640d4fae7db93c0aeefd5d830bf2735 Mon Sep 17 00:00:00 2001
From: Mike Welsh <mwelsh@gmail.com>
Date: Tue, 1 Sep 2020 16:39:05 -0700
Subject: [PATCH] core: Return version from MovieClip::swf_version (fix #1086)

MovieClip was not returning the proper SWF version, causing it to
default to the newest SWF version in some cases when it shouldn't.
---
 core/src/display_object.rs            | 3 ---
 core/src/display_object/movie_clip.rs | 4 ++++
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/src/display_object.rs b/core/src/display_object.rs
index a1160427a..5a55fbdea 100644
--- a/core/src/display_object.rs
+++ b/core/src/display_object.rs
@@ -1063,9 +1063,6 @@ macro_rules! impl_display_object_sansbounds {
                 .$field
                 .set_transformed_by_script(value)
         }
-        fn swf_version(&self) -> u8 {
-            self.0.read().$field.swf_version()
-        }
         fn instantiate(
             &self,
             gc_context: gc_arena::MutationContext<'gc, '_>,
diff --git a/core/src/display_object/movie_clip.rs b/core/src/display_object/movie_clip.rs
index 1e11d9e6c..73cd139f5 100644
--- a/core/src/display_object/movie_clip.rs
+++ b/core/src/display_object/movie_clip.rs
@@ -1012,6 +1012,10 @@ impl<'gc> TDisplayObject<'gc> for MovieClip<'gc> {
         Some(self.0.read().movie())
     }
 
+    fn swf_version(&self) -> u8 {
+        self.0.read().movie().version()
+    }
+
     fn run_frame(&self, context: &mut UpdateContext<'_, 'gc, '_>) {
         // Children must run first.
         for child in self.children() {