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

web: Destroy shouldn't be able to throw exceptions

This commit is contained in:
Nathan Adams 2020-09-12 21:10:46 +02:00 committed by Mike Welsh
parent 58cd1abcf2
commit 69d1e903fb
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
web/packages/core/src/ruffle-player.js
View File

@ -126,11 +126,7 @@ exports.RufflePlayer = class RufflePlayer extends HTMLElement {
*/ */
async ensure_fresh_instance() { async ensure_fresh_instance() {
if (this.instance) { if (this.instance) {
try { this.instance.destroy();
this.instance.destroy();
} catch (e) {
console.warn("Error destroying old ruffle player:", e);
}
this.instance = null; this.instance = null;
console.log("Ruffle instance destroyed."); console.log("Ruffle instance destroyed.");
} }
@ -313,14 +309,7 @@ exports.RufflePlayer = class RufflePlayer extends HTMLElement {
*/ */
panic() { panic() {
if (this.instance) { if (this.instance) {
try { this.instance.destroy();
this.instance.destroy();
} catch (e) {
console.error(
"Whilst panicking ruffle, an additional error was encountered during destruction:",
e
);
}
this.instance = null; this.instance = null;
} }
// Clears out any existing content (ie play button or canvas) and replaces it with the error screen // Clears out any existing content (ie play button or canvas) and replaces it with the error screen

5
web/src/lib.rs
View File

@ -152,7 +152,7 @@ impl Ruffle {
}); });
} }
pub fn destroy(&mut self) -> Result<(), JsValue> { pub fn destroy(&mut self) {
// Remove instance from the active list. // Remove instance from the active list.
if let Some(instance) = INSTANCES.with(|instances| { if let Some(instance) = INSTANCES.with(|instances| {
let mut instances = instances.borrow_mut(); let mut instances = instances.borrow_mut();
@ -175,13 +175,12 @@ impl Ruffle {
// Cancel the animation handler, if it's still active. // Cancel the animation handler, if it's still active.
if let Some(id) = instance.animation_handler_id { if let Some(id) = instance.animation_handler_id {
if let Some(window) = web_sys::window() { if let Some(window) = web_sys::window() {
return window.cancel_animation_frame(id.into()); let _ = window.cancel_animation_frame(id.into());
} }
} }
} }
// Player is dropped at this point. // Player is dropped at this point.
Ok(())
} }
#[allow(clippy::boxed_local)] // for js_bind #[allow(clippy::boxed_local)] // for js_bind