From 29ad46daf506d87408bd65e8c9af8c20844bbc79 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Fri, 24 Mar 2023 15:56:16 +0100 Subject: [PATCH] avm1: Ensure MovieClip.beginBitmapFill updates the bitmap handle --- core/src/avm1/globals/movie_clip.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/avm1/globals/movie_clip.rs b/core/src/avm1/globals/movie_clip.rs index eb18196c9..b8e811a54 100644 --- a/core/src/avm1/globals/movie_clip.rs +++ b/core/src/avm1/globals/movie_clip.rs @@ -400,13 +400,8 @@ fn begin_bitmap_fill<'gc>( .and_then(|val| val.coerce_to_object(activation).as_bitmap_data_object()) { // Register the bitmap data with the drawing. - let bitmap_data = bitmap_data.bitmap_data(); - let mut bitmap_data = bitmap_data.write(activation.context.gc_context); - let handle = if let Some(handle) = bitmap_data.bitmap_handle(activation.context.renderer) { - handle - } else { - return Ok(Value::Undefined); - }; + let bitmap_data = bitmap_data.bitmap_data_wrapper(); + let handle = bitmap_data.bitmap_handle(&mut activation.context); let bitmap = ruffle_render::bitmap::BitmapInfo { handle, width: bitmap_data.width() as u16,