From ef887403cf20ea5ddbd424aba56a3270535f001a Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Thu, 20 Oct 2022 23:55:29 +0200
Subject: [PATCH] - marked a few Printf calls in critical error paths as
 PRINT_NONOTIFY.

---
 src/common/engine/serializer.cpp    | 2 +-
 src/common/menu/menu.cpp            | 2 +-
 src/common/scripting/vm/vmframe.cpp | 3 +--
 src/d_main.cpp                      | 4 ++--
 src/playsim/dthinker.cpp            | 4 ++--
 5 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/common/engine/serializer.cpp b/src/common/engine/serializer.cpp
index f42289573..a024aeb4d 100644
--- a/src/common/engine/serializer.cpp
+++ b/src/common/engine/serializer.cpp
@@ -683,7 +683,7 @@ void FSerializer::ReadObjects(bool hubtravel)
 							{
 								r->mObjects.Clamp(size);	// close all inner objects.
 								// In case something in here throws an error, let's continue and deal with it later.
-								Printf(TEXTCOLOR_RED "'%s'\n while restoring %s\n", err.GetMessage(), obj ? obj->GetClass()->TypeName.GetChars() : "invalid object");
+								Printf(PRINT_NONOTIFY, TEXTCOLOR_RED "'%s'\n while restoring %s\n", err.GetMessage(), obj ? obj->GetClass()->TypeName.GetChars() : "invalid object");
 								mErrors++;
 							}
 						}
diff --git a/src/common/menu/menu.cpp b/src/common/menu/menu.cpp
index 187fe5e9e..6a8ce3ddc 100644
--- a/src/common/menu/menu.cpp
+++ b/src/common/menu/menu.cpp
@@ -925,7 +925,7 @@ void M_Init (void)
 	catch (CVMAbortException &err)
 	{
 		err.MaybePrintMessage();
-		Printf("%s", err.stacktrace.GetChars());
+		Printf(PRINT_NONOTIFY, "%s", err.stacktrace.GetChars());
 		I_FatalError("Failed to initialize menus");
 	}
 	M_CreateMenus();
diff --git a/src/common/scripting/vm/vmframe.cpp b/src/common/scripting/vm/vmframe.cpp
index 476b945c2..8a4b87458 100644
--- a/src/common/scripting/vm/vmframe.cpp
+++ b/src/common/scripting/vm/vmframe.cpp
@@ -682,8 +682,7 @@ void CVMAbortException::MaybePrintMessage()
 	auto m = GetMessage();
 	if (m != nullptr)
 	{
-		Printf(TEXTCOLOR_RED);
-		Printf("%s\n", m);
+		Printf(PRINT_NONOTIFY, TEXTCOLOR_RED "%s\n", m);
 		SetMessage("");
 	}
 }
diff --git a/src/d_main.cpp b/src/d_main.cpp
index 6aee6738e..dd41b3940 100644
--- a/src/d_main.cpp
+++ b/src/d_main.cpp
@@ -1231,14 +1231,14 @@ void D_DoomLoop ()
 		{
 			if (error.GetMessage ())
 			{
-				Printf (PRINT_BOLD, "\n%s\n", error.GetMessage());
+				Printf (PRINT_NONOTIFY | PRINT_BOLD, "\n%s\n", error.GetMessage());
 			}
 			D_ErrorCleanup ();
 		}
 		catch (CVMAbortException &error)
 		{
 			error.MaybePrintMessage();
-			Printf("%s", error.stacktrace.GetChars());
+			Printf(PRINT_NONOTIFY, "%s", error.stacktrace.GetChars());
 			D_ErrorCleanup();
 		}
 	}
diff --git a/src/playsim/dthinker.cpp b/src/playsim/dthinker.cpp
index e35304fb8..37e135230 100644
--- a/src/playsim/dthinker.cpp
+++ b/src/playsim/dthinker.cpp
@@ -538,7 +538,7 @@ bool FThinkerList::DoDestroyThinkers()
 			{
 				Printf("VM exception in DestroyThinkers:\n");
 				exception.MaybePrintMessage();
-				Printf("%s", exception.stacktrace.GetChars());
+				Printf(PRINT_NONOTIFY, "%s", exception.stacktrace.GetChars());
 				// forcibly delete this. Cleanup may be incomplete, though.
 				node->ObjectFlags |= OF_YesReallyDelete;
 				delete node;
@@ -546,7 +546,7 @@ bool FThinkerList::DoDestroyThinkers()
 			}
 			catch (CRecoverableError &exception)
 			{
-				Printf("Error in DestroyThinkers: %s\n", exception.GetMessage());
+				Printf(PRINT_NONOTIFY, "Error in DestroyThinkers: %s\n", exception.GetMessage());
 				// forcibly delete this. Cleanup may be incomplete, though.
 				node->ObjectFlags |= OF_YesReallyDelete;
 				delete node;