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: Actually unload movies when we get an empty URL in `GetURL2` and the target is a sprite.

This commit is contained in:
David Wendt 2020-09-28 19:51:19 -04:00 committed by Mike Welsh
parent 8c53c9116f
commit e73cdd7987
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1261,15 +1261,23 @@ impl<'a, 'gc, 'gc_context> Activation<'a, 'gc, 'gc_context> {
Cow::Borrowed(&url),
NavigationMethod::from_send_vars_method(swf_method),
);
let fetch = self.context.navigator.fetch(&url, opts);
let process = self.context.load_manager.load_movie_into_clip(
self.context.player.clone().unwrap(),
clip_target,
fetch,
url.to_string(),
None,
);
self.context.navigator.spawn_future(process);
if url == "" {
//Blank URL on movie loads = unload!
if let Some(mut mc) = clip_target.as_movie_clip() {
mc.replace_with_movie(self.context.gc_context, None)
}
} else {
let fetch = self.context.navigator.fetch(&url, opts);
let process = self.context.load_manager.load_movie_into_clip(
self.context.player.clone().unwrap(),
clip_target,
fetch,
url.to_string(),
None,
);
self.context.navigator.spawn_future(process);
}
}
return Ok(FrameControl::Continue);