Moved the GetNewGameCount() check to the init quest

source/scripts/_00e_mqp01_functions.psc

@@ -8,7 +8,6 @@ Import Utility
 
 Function SetUpScene()
 
-	Game.SetInChargen(true, true, false)
 	Game.FadeOutGame(false, true, 0.5, 0.5)
 	FadeToBlackHoldIMOD.Apply()
 	PlayerREF.SetScale(0.85)

source/scripts/_00e_mqp01_startsc.psc

@@ -3,35 +3,27 @@ Scriptname _00E_MQP01_StartSC extends ObjectReference
 Event OnTriggerEnter (ObjectReference akActionREF)
 
 	if akActionRef == PlayerREF && !bDone
-		bDone = true ; deletion may take some time
-		Delete()
-		If !MQ10a.IsRunning() 
-			If !MQ12c.IsRunning()
-				if EnderalFunctions.GetNewGameCount() > 1
-					Game.QuitToMainMenu()
-					Debug.MessageBox("Due to an engine bug, new game should not be started after quitting to the main menu. Please, restart Enderal first.")
-					return
-				endif
-			
-				if _00E_QuickStartPrompt.Show() > 0
-					MQP01.CompleteAllObjectives()
-					MQP01.CompleteQuest()
-					MQP02.CompleteAllObjectives()
-					MQP02.CompleteQuest()
-					Utility.wait(0.5)
-					If _00E_VideoSkip.GetValueInt() == 0
-						Game.PlayBink("MQP03NearDeathExperience.bik", true)
-					EndIf
-					PlayerREF.MoveTo(_00E_ClassMenuOrigin)
-					Debug.SendAnimationEvent(PlayerRef, "IdleForceDefaultState")
-					Game.ShowRaceMenu()
-					Game.DisablePlayerControls(false, true, true, false, true, false, false, true)
-					MQP03.SetCurrentStageID(15)
-					(MQP02 as _00E_MQP02_Functions).AddRacialAbilites()
-				else
-					MQP01.SetCurrentStageID(10)
-				endif
-			EndIf
+		bDone = true
+		Disable()
+		If ! MQP01.IsCompleted() && MQ10a.GetCurrentStageID() != 5 && !MQ10a.IsRunning() && !MQ12c.IsRunning()
+			if _00E_QuickStartPrompt.Show() > 0
+				MQP01.CompleteAllObjectives()
+				MQP01.CompleteQuest()
+				MQP02.CompleteAllObjectives()
+				MQP02.CompleteQuest()
+				Utility.wait(0.5)
+				If _00E_VideoSkip.GetValueInt() == 0
+					Game.PlayBink("MQP03NearDeathExperience.bik", true)
+				EndIf
+				PlayerREF.MoveTo(_00E_ClassMenuOrigin)
+				Debug.SendAnimationEvent(PlayerRef, "IdleForceDefaultState")
+				Game.ShowRaceMenu()
+				Game.DisablePlayerControls(false, true, true, false, true, false, false, true)
+				MQP03.SetCurrentStageID(15)
+				(MQP02 as _00E_MQP02_Functions).AddRacialAbilites()
+			else
+				MQP01.SetCurrentStageID(10)
+			endif
 		EndIf
 	EndIf
 

source/scripts/qf_mq101_0003372b.psc

@@ -25,6 +25,11 @@ Function Fragment_332()
 ;BEGIN CODE
 game.GetPlayer().RemoveAllItems(none, false, false)
 game.GetPlayer().MoveTo(Alias_StartMarkerRef.GetReference(), 0.000000, 0.000000, 0.000000, true)
+
+if EnderalFunctions.GetNewGameCount() > 1
+	Game.QuitToMainMenu()
+	Debug.MessageBox("Due to an engine bug, new game should not be started after quitting to the main menu. Please, restart Enderal first.")
+endif
 ;END CODE
 EndFunction
 ;END FRAGMENT