liangsheng8708
/
ruffle
mirror of https://mirror.ghproxy.com/https://github.com/ruffle-rs/ruffle.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

avm1: loadMovieNum with blank url is an unload, not a load - fixes #7337

This commit is contained in:
Nathan Adams 2022-08-08 23:20:32 +02:00 committed by relrelb
parent 4b19910791
commit fb1ebcb9cc
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/avm1/activation.rs
View File

@ -1291,14 +1291,21 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
} else if level_target > -1 {
// `loadMovieNum` call.
if let Some(clip_target) = clip_target {
let future = self.context.load_manager.load_movie_into_clip(
self.context.player.clone(),
clip_target,
Request::get(url.to_utf8_lossy().into_owned()),
None,
None,
);
self.context.navigator.spawn_future(future);
if url.is_empty() {
// Blank URL on movie loads = unload!
if let Some(mut mc) = clip_target.as_movie_clip() {
mc.replace_with_movie(&mut self.context, None)
}
} else {
let future = self.context.load_manager.load_movie_into_clip(
self.context.player.clone(),
clip_target,
Request::get(url.to_utf8_lossy().into_owned()),
None,
None,
);
self.context.navigator.spawn_future(future);
}
}
return Ok(FrameControl::Continue);
}