Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Don't attempt to wait for session ending when it has already ended

Browse source 
See https://github.com/immersive-web/webxr/pull/939
This commit is contained in:
Manish Goregaokar 2019-12-10 14:40:07 -08:00
parent d46cbb2083
commit 51af3be468
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/script/dom/xrsession.rs
View file

@ -540,6 +540,19 @@ impl XRSessionMethods for XRSession {
fn End(&self) -> Rc<Promise> {
let global = self.global();
let p = Promise::new(&global);
if self.ended.get() && self.end_promises.borrow().is_empty() {
// If the session has completely ended and all end promises have been resolved,
// don't queue up more end promises
//
// We need to check for end_promises being empty because `ended` is set
// before everything has been completely shut down, and we do not want to
// prematurely resolve the promise then
//
// However, if end_promises is empty, then all end() promises have already resolved,
// so the session has completely shut down and we should not queue up more promises
p.resolve_native(&());
return p;
}
self.end_promises.borrow_mut().push(p.clone());
// This is duplicated in event_callback since this should
// happen ASAP for end() but can happen later if the device