X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=9f18adbe8b413dce59899fe9ac17cb35cec9243a;hp=417d149bc0d47feb4133f377224b1d615b647cf0;hb=06d8cf152effee74879d58cd6f05b6b6a7a982d1;hpb=d6338db94d8402c3f47a422069d352fced1e496e

diff --git a/src/events.c b/src/events.c
index 417d149b..9f18adbe 100644
--- a/src/events.c
+++ b/src/events.c
@@ -2113,6 +2113,10 @@ void HandleKey(Key key, int key_status)
     case GAME_MODE_SETUP:
     case GAME_MODE_INFO:
     case GAME_MODE_SCORES:
+
+      if (anyTextGadgetActiveOrJustFinished && key != KSYM_Escape)
+	break;
+
       switch (key)
       {
 	case KSYM_space:
@@ -2393,6 +2397,9 @@ void HandleJoystick(void)
     case GAME_MODE_INFO:
     case GAME_MODE_SCORES:
     {
+      if (anyTextGadgetActive())
+	break;
+
       if (game_status == GAME_MODE_TITLE)
 	HandleTitleScreen(0,0,dx,dy, newbutton ? MB_MENU_CHOICE : MB_MENU_MARK);
       else if (game_status == GAME_MODE_MAIN)