Ignore K_GAMEMSG presses if the game hasn't started, fixes Debian

2003-08-28  Jordi Mallach  <jordi@sindominio.net>

	* src/gtetrinet.c (keypress): Ignore K_GAMEMSG presses if the game
	hasn't started, fixes Debian Bug#205658. Patch from
	Benjamin Drieu <benj@debian.org>, thanks!

diff --git a/ChangeLog b/ChangeLog
index 0c4fa7e969259accaf0583938dccca5a308598ed..24b58c787684bcabf31da08a49811b6622d0af8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-28  Jordi Mallach  <jordi@sindominio.net>
+
+       * src/gtetrinet.c (keypress): Ignore K_GAMEMSG presses if the game
+       hasn't started, fixes Debian Bug#205658. Patch from
+       Benjamin Drieu <benj@debian.org>, thanks!
+
 2003-08-20  Dani Carbonell  <bocata@panete.net>
 
        * src/fields.c (fields_page_new): Changed the cursor when the

diff --git a/src/gtetrinet.c b/src/gtetrinet.c
index b0603ebec521ec95030ec9cd33b1c8f17b5cf0fb..624c08b3c80018637076aa9da1c32f955cea7a15 100644 (file)
--- a/src/gtetrinet.c
+++ b/src/gtetrinet.c
@@ -433,7 +433,7 @@ gint keypress (GtkWidget *widget, GdkEventKey *key)
     if ((key->state & (GDK_MOD1_MASK | GDK_CONTROL_MASK | GDK_SHIFT_MASK)) > 0)
       return FALSE;
     
-    if (game_area && (gdk_keyval_to_lower (key->keyval) == keys[K_GAMEMSG]))
+    if (game_area && ingame && (gdk_keyval_to_lower (key->keyval) == keys[K_GAMEMSG]))
     {
       g_signal_handler_block (app, keypress_signal);
       fields_gmsginputactivate (TRUE);