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

core: Fix ChildContainer.replace_at_depth() panic 

Avoid panic in ChildContainer.replace_at_depth() panic when previous child is not in render list.

---------

Co-authored-by: Gleb Piskunov <emgfc@ya.ru>
This commit is contained in:
Gleb Piskunov 2023-03-27 01:47:07 +06:00 committed by GitHub
parent 3b7172de8d
commit 6f7e491bc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/display_object/container.rs
View File

@ -637,17 +637,23 @@ impl<'gc> ChildContainer<'gc> {
) -> Option<DisplayObject<'gc>> {
let prev_child = self.insert_child_into_depth_list(depth, child);
if let Some(prev_child) = prev_child {
let position = self
if let Some(position) = self
.render_list
.iter()
.position(|x| DisplayObject::ptr_eq(*x, prev_child))
.unwrap();
if !prev_child.placed_by_script() {
self.replace_id(position, child);
Some(prev_child)
{
if !prev_child.placed_by_script() {
self.replace_id(position, child);
Some(prev_child)
} else {
self.insert_id(position + 1, child);
None
}
} else {
self.insert_id(position + 1, child);
tracing::error!(
"ChildContainer::replace_at_depth: Previous child is not in render list"
);
self.push_id(child);
None
}
} else {