Add a top-level catch-handler for std::string

jvernet · Dec 11, 2021 · 19aadbf · 19aadbf
1 parent 408f5fe
commit 19aadbf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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;