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: Correct AsBroadcaster removeListener

This commit is contained in:
relrelb 2021-06-19 12:05:32 +03:00 committed by Mike Welsh
parent 8742f288cb
commit 7948d872dc
1 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
core/src/avm1/globals/as_broadcaster.rs
View File

@ -88,29 +88,11 @@ pub fn remove_listener<'gc>(
if let Value::Object(listeners) = listeners {
let length = listeners.length(activation)?;
let mut position = None;
for i in 0..length {
let other_listener = listeners.get_element(activation, i);
if old_listener == other_listener {
position = Some(i);
break;
}
}
if let Some(position) = position {
if length > 0 {
let new_length = length - 1;
for i in position..new_length {
let element = listeners.get_element(activation, i + 1);
listeners.set_element(activation, i, element)?;
}
listeners.delete_element(activation, new_length);
listeners.set_length(activation, new_length)?;
return Ok(true.into());
}
if let Some(index) =
(0..length).find(|&i| listeners.get_element(activation, i) == old_listener)
{
listeners.call_method("splice", &[index.into(), 1.into()], activation)?;
return Ok(true.into());
}
}