From 6da5211f7bb22b99a5b3730c33be3e58d76c4dee Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Tue, 10 Jul 2001 19:21:36 +0000
Subject: [PATCH]

---
 source/game/game.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/source/game/game.cpp b/source/game/game.cpp
index 71005e2e4..da1598336 100644
--- a/source/game/game.cpp
+++ b/source/game/game.cpp
@@ -570,7 +570,8 @@ void CGameScene::think_playing(int _frames)
 
 
 	// Auto-timer stuff
-	if(m_levelHasTimer)
+	if(m_levelHasTimer&&
+	   !CConversation::isActive()&&!m_pauseMenu->isActive())
 	{
 		m_timer-=_frames;
 		if(m_timer<0)