From 4ac76d82d869df058bdd983d08790552290afb4f Mon Sep 17 00:00:00 2001
From: Rachael Alexanderson <madame-rachelle@users.noreply.github.com>
Date: Fri, 3 Feb 2023 20:21:40 -0500
Subject: [PATCH] - redirected maps need to be defined in order to redirect

---
 src/g_level.cpp            | 4 ++--
 src/gamedata/g_mapinfo.cpp | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/g_level.cpp b/src/g_level.cpp
index 101c942a8..dda4651e6 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -562,8 +562,8 @@ void G_InitNew (const char *mapname, bool bTitleLevel)
 		auto redirectmap = FindLevelInfo(mapname);
 		if (redirectmap->RedirectCVAR != NAME_None)
 			redirectmap = redirectmap->CheckLevelRedirect();
-		if (redirectmap)
-			mapname = redirectmap->MapName;
+		if (redirectmap && redirectmap->MapName.GetChars()[0])
+				mapname = redirectmap->MapName;
 	}
 
 	G_VerifySkill();
diff --git a/src/gamedata/g_mapinfo.cpp b/src/gamedata/g_mapinfo.cpp
index 89d24c9fb..b87036be7 100644
--- a/src/gamedata/g_mapinfo.cpp
+++ b/src/gamedata/g_mapinfo.cpp
@@ -403,12 +403,14 @@ level_info_t *level_info_t::CheckLevelRedirect ()
 					if (playeringame[i] && (var = GetCVar(i, RedirectCVAR.GetChars())))
 					{
 						if (var->ToInt())
-							return FindLevelInfo(RedirectCVARMapName);
+							if (P_CheckMapData(RedirectCVARMapName))
+								return FindLevelInfo(RedirectCVARMapName);
 					}
 				}
 			}
 			else if (var->ToInt())
-				return FindLevelInfo(RedirectCVARMapName);
+				if (P_CheckMapData(RedirectCVARMapName))
+					return FindLevelInfo(RedirectCVARMapName);
 		}
 	}
 	return NULL;