From 19aadbfb8df421cbdd89dc5a8214259d77570adb Mon Sep 17 00:00:00 2001
From: tomcw <tomcw@users.noreply.github.com>
Date: Sat, 11 Dec 2021 20:27:39 +0000
Subject: [PATCH] Add a top-level catch-handler for std::string

---
 source/LanguageCard.cpp     | 2 +-
 source/Windows/AppleWin.cpp | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/source/LanguageCard.cpp b/source/LanguageCard.cpp
index 246285861..31413a84a 100644
--- a/source/LanguageCard.cpp
+++ b/source/LanguageCard.cpp
@@ -48,7 +48,7 @@ LanguageCardUnit::LanguageCardUnit(SS_CARDTYPE type, UINT slot) :
 	m_uLastRamWrite(0)
 {
 	if (m_slot != LanguageCardUnit::kSlot0)
-		throw std::string("Card: wrong slot");
+		throw std::string("Language Card: wrong slot");		// throws to the top-level catch-handler, and shuts down
 
 	SetMemMainLanguageCard(NULL, true);
 }
diff --git a/source/Windows/AppleWin.cpp b/source/Windows/AppleWin.cpp
index bd3fcc211..d709636d9 100644
--- a/source/Windows/AppleWin.cpp
+++ b/source/Windows/AppleWin.cpp
@@ -577,6 +577,10 @@ int APIENTRY WinMain(HINSTANCE passinstance, HINSTANCE, LPSTR lpCmdLine, int)
 	{
 		ExceptionHandler(exception.what());
 	}
+	catch(std::string error)
+	{
+		ExceptionHandler(error.c_str());
+	}
 
 	Shutdown();
 	return 0;