From eb273ffd895deeeabc362302a2584f8700a74f6d Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 10 Jun 2019 09:13:22 +0200
Subject: [PATCH] - fixed episode startup completely.

---
 prboom2/src/m_menu.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/prboom2/src/m_menu.c b/prboom2/src/m_menu.c
index b187fa8e6..77b466761 100644
--- a/prboom2/src/m_menu.c
+++ b/prboom2/src/m_menu.c
@@ -558,7 +558,7 @@ menu_t EpiDef =
 
 // This is for customized episode menus
 int EpiCustom;
-short EpiMenuEpi[8], EpiMenuMap[8];
+short EpiMenuEpi[8] = { 1, 1, 1, 1, -1, -1, -1, -1 }, EpiMenuMap[8] = { 1,2,3,4,-1,-1,-1,-1 };
 
 //
 //    M_Episode
@@ -730,9 +730,9 @@ void M_ChooseSkill(int choice)
       M_StartMessage(s_NIGHTMARE,M_VerifyNightmare,true);
       return;
     }
+  if (EpiMenuEpi[epi] == -1 || EpiMenuMap[epi] == -1) return;	// There is no map to start here.
 
-  if (!EpiCustom) G_DeferedInitNew(choice,epi+1,1);
-  else G_DeferedInitNew(choice, EpiMenuEpi[epi], EpiMenuMap[epi]);
+  G_DeferedInitNew(choice, EpiMenuEpi[epi], EpiMenuMap[epi]);
   M_ClearMenus ();
 }