From 2189d193246fca2dc1728a168dec06c18cefaba6 Mon Sep 17 00:00:00 2001 From: Nathan Adams Date: Wed, 18 Jan 2023 20:45:59 +0100 Subject: [PATCH] desktop: Also include avm2 stacktrace in panic report --- desktop/src/main.rs | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/desktop/src/main.rs b/desktop/src/main.rs index 7c59431b1..f79ae1b50 100644 --- a/desktop/src/main.rs +++ b/desktop/src/main.rs @@ -920,6 +920,13 @@ fn panic_hook(info: &PanicInfo) { extra_info.push(format!("SWF: {swf_name}")); } }); + CALLSTACK.with(|callstack| { + if let Some(callstack) = &*callstack.borrow() { + callstack.avm2(|callstack| { + extra_info.push(format!("AVM2 Callstack:\n```{callstack}\n```")); + }); + } + }); if !extra_info.is_empty() { params.push(("extra_info", extra_info.join("\n"))); }