From fcb08402465c372da70009c97818933ef2ceca37 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@zdoom.fake>
Date: Tue, 28 Feb 2012 02:07:06 +0000
Subject: [PATCH] - Fixed: The DConversationMenu constructor is not the
 appropriate place to set menuactive to   MENU_OnNoPause.

SVN r3396 (trunk)
---
 src/p_conversation.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/p_conversation.cpp b/src/p_conversation.cpp
index 4e4d8fd5e..dabb5f59a 100644
--- a/src/p_conversation.cpp
+++ b/src/p_conversation.cpp
@@ -727,7 +727,6 @@ public:
 
 	DConversationMenu(FStrifeDialogueNode *CurNode) 
 	{
-		menuactive = MENU_OnNoPause;
 		mCurNode = CurNode;
 		mDialogueLines = NULL;
 		mShowGold = false;
@@ -1171,6 +1170,7 @@ void P_StartConversation (AActor *npc, AActor *pc, bool facetalker, bool saveang
 		M_StartControlPanel (false);
 		M_ActivateMenu(cmenu);
 		ConversationPauseTic = gametic + 20;
+		menuactive = MENU_OnNoPause;
 	}
 }