From 18b25e242ed9ae890fa5d04b9af9cc460d440ce8 Mon Sep 17 00:00:00 2001
From: Gwilym Inzani <email@gwilym.dev>
Date: Wed, 17 Apr 2024 17:49:31 +0100
Subject: [PATCH] Handle this in both panic handlers

---
 agb/src/lib.rs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/agb/src/lib.rs b/agb/src/lib.rs
index 14cdddda..cb8f83dc 100644
--- a/agb/src/lib.rs
+++ b/agb/src/lib.rs
@@ -203,6 +203,9 @@ pub use {agb_alloc::ExternalAllocator, agb_alloc::InternalAllocator};
 #[panic_handler]
 #[allow(unused_must_use)]
 fn panic_implementation(info: &core::panic::PanicInfo) -> ! {
+    avoid_double_panic();
+
+    use core::fmt::Write;
     if let Some(mut mgba) = mgba::Mgba::new() {
         let _ = mgba.print(format_args!("{info}"), mgba::DebugLevel::Fatal);
     }
@@ -211,6 +214,16 @@ fn panic_implementation(info: &core::panic::PanicInfo) -> ! {
     loop {}
 }
 
+fn avoid_double_panic() {
+    static IS_PANICKING: portable_atomic::AtomicBool = portable_atomic::AtomicBool::new(false);
+    if IS_PANICKING.load(portable_atomic::Ordering::SeqCst) {
+        // we panicked during the panic handler, so not much we can do here
+        loop {}
+    } else {
+        IS_PANICKING.store(true, portable_atomic::Ordering::SeqCst);
+    }
+}
+
 /// The Gba struct is used to control access to the Game Boy Advance's hardware in a way which makes it the
 /// borrow checker's responsibility to ensure no clashes of global resources.
 ///
@@ -325,13 +338,7 @@ pub mod test_runner {
 
     #[panic_handler]
     fn panic_implementation(info: &core::panic::PanicInfo) -> ! {
-        static IS_PANICKING: portable_atomic::AtomicBool = portable_atomic::AtomicBool::new(false);
-        if IS_PANICKING.load(portable_atomic::Ordering::SeqCst) {
-            // we panicked during the panic handler, so not much we can do here
-            loop {}
-        } else {
-            IS_PANICKING.store(true, portable_atomic::Ordering::SeqCst);
-        }
+        avoid_double_panic();
 
         #[cfg(feature = "backtrace")]
         let frames = backtrace::unwind_exception();