From 3b6fa457e8284478d16f8c9a2cbdd2efb1af8da9 Mon Sep 17 00:00:00 2001
From: "Anton E. Gavrilov" <tonik@vipmail.ru>
Date: Sat, 1 Apr 2000 22:49:07 +0000
Subject: [PATCH] Minor bugfixes.

---
 common/console.c | 6 ++++++
 common/keys.c    | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/common/console.c b/common/console.c
index 64bb383..b877379 100644
--- a/common/console.c
+++ b/common/console.c
@@ -152,6 +152,9 @@ Con_MessageMode_f
 */
 void Con_MessageMode_f (void)
 {
+	if (cls.state != ca_active)
+		return;
+
 	chat_team = false;
 	key_dest = key_message;
 }
@@ -163,6 +166,9 @@ Con_MessageMode2_f
 */
 void Con_MessageMode2_f (void)
 {
+	if (cls.state != ca_active)
+		return;
+
 	chat_team = true;
 	key_dest = key_message;
 }
diff --git a/common/keys.c b/common/keys.c
index ec82ead..7f0f4f9 100644
--- a/common/keys.c
+++ b/common/keys.c
@@ -762,7 +762,6 @@ void Key_Init (void)
 	keyshift['\\'] = '|';
 
 	menubound[K_ESCAPE] = true;
-	menubound['~'] = true;	// Tonik
 	for (i=0 ; i<12 ; i++)
 		menubound[K_F1+i] = true;
 
@@ -824,6 +823,9 @@ void Key_Event (int key, qboolean down)
 	if (key == K_CTRL)
 		ctrl_down = down;
 
+	if (key_dest == key_message && cls.state != ca_active)
+		key_dest = key_console;
+		
 //
 // handle escape specialy, so the user can never unbind it
 //
@@ -880,7 +882,7 @@ void Key_Event (int key, qboolean down)
 // during demo playback, most keys bring up the main menu
 //
 	if (cls.demoplayback && down && consolekeys[key] && key_dest == key_game
-	  && key != K_CTRL && key != K_DEL && key != K_HOME && key != K_END)
+	  && key != K_CTRL && key != K_DEL && key != K_HOME && key != K_END && key != K_TAB)
 	{
 		M_ToggleMenu_f ();
 		return;