From dfcea0f955eca250a8be182e085024e1f8b6b0ee Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Tue, 14 Aug 2001 13:50:56 +0000
Subject: [PATCH]

---
 source/fma/fma.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/fma/fma.cpp b/source/fma/fma.cpp
index 395961338..495ae5da2 100644
--- a/source/fma/fma.cpp
+++ b/source/fma/fma.cpp
@@ -1436,17 +1436,6 @@ void	CFmaScene::think(int _frames)
 		m_musicPlaying=true;
 	}
 
-	if(PadGetHeld(0) & PAD_START)
-	{ // Give player an exit option!!
-			m_scriptRunning=false;
-			m_doOtherProcessing=true;
-	}
-
-	if(m_scriptRunning==false&&!m_readyToShutdown)
-	{
-		startShutdown();
-	}
-
 	for(int i=0;i<_frames;i++)
 	{
 		if(m_scriptRunning)
@@ -1602,6 +1591,17 @@ void	CFmaScene::think(int _frames)
 		}
 	}
 
+	if(!CFader::isFading()&&PadGetHeld(0) & PAD_START)
+	{ // Give player an exit option!!
+			m_scriptRunning=false;
+			m_doOtherProcessing=true;
+	}
+
+	if(m_scriptRunning==false&&!m_readyToShutdown)
+	{
+		startShutdown();
+	}
+
 	CThingManager::thinkAllThings(_frames);
 	CConversation::think(_frames);