From 2d10c1ffe24e90027e6595e057e856b6b6fb3470 Mon Sep 17 00:00:00 2001
From: ergo720 <45463469+ergo720@users.noreply.github.com>
Date: Thu, 29 Apr 2021 12:56:37 +0200
Subject: [PATCH] Also print exception code and address

---
 src/core/kernel/support/Emu.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/kernel/support/Emu.cpp b/src/core/kernel/support/Emu.cpp
index 2d181f8aa..2be02bac8 100644
--- a/src/core/kernel/support/Emu.cpp
+++ b/src/core/kernel/support/Emu.cpp
@@ -196,10 +196,11 @@ void EmuExceptionNonBreakpointUnhandledShow(LPEXCEPTION_POINTERS e)
 	std::fflush(stdout);
 
 	if (PopupFatalEx(nullptr, PopupButtons::OkCancel, PopupReturn::Ok,
-		"  The running xbe has encountered an unrecoverable error.\n"
+		"  The running xbe has encountered an unhandled exception (Code := 0x%.8X) at address 0x%.08X.\n"
 		"\n"
 		"  Press \"OK\" to terminate emulation.\n"
-		"  Press \"Cancel\" to debug.") == PopupReturn::Ok)
+		"  Press \"Cancel\" to debug.",
+		e->ExceptionRecord->ExceptionCode, e->ContextRecord->Eip) == PopupReturn::Ok)
 	{
 		EmuExceptionExitProcess();
 	}