From 4b9ea929694e8655f5cb04a31ebbffc567f931cf Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sat, 15 Jan 2022 19:20:58 +0100
Subject: [PATCH] - gracefully handle when a map tries to exit twice.

This case left a broken ScreenJobRunner behind which later crashed on garbage collection.
---
 source/core/mainloop.cpp  | 1 -
 source/core/screenjob.cpp | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/core/mainloop.cpp b/source/core/mainloop.cpp
index 624cca9ba..7926f9653 100644
--- a/source/core/mainloop.cpp
+++ b/source/core/mainloop.cpp
@@ -195,7 +195,6 @@ static void GameTicker()
 			FX_StopAllSounds();
 			FX_SetReverb(0);
 			gi->LevelCompleted(g_nextmap, g_nextskill);
-			assert(gameaction != ga_nothing);
 			break;
 
 		case ga_nextlevel:
diff --git a/source/core/screenjob.cpp b/source/core/screenjob.cpp
index 60357b366..45735146c 100644
--- a/source/core/screenjob.cpp
+++ b/source/core/screenjob.cpp
@@ -160,6 +160,7 @@ void ShowScoreboard(int numplayers, const CompletionFunc& completion_)
 {
 	completion = completion_;
 	runner = CreateRunner();
+	Printf("Created runner at %p\n", runner);
 	GC::WriteBarrier(runner);
 
 	const char* qname = globalCutscenes.MPSummaryScreen;
@@ -188,6 +189,8 @@ void ShowScoreboard(int numplayers, const CompletionFunc& completion_)
 
 void ShowIntermission(MapRecord* fromMap, MapRecord* toMap, SummaryInfo* info, CompletionFunc completion_)
 {
+	if (runner != nullptr) 
+		return;	// protection against double exits.
 	if (fromMap == toMap)
 	{
 		// don't show intermission when restarting the same level.