X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fevents.c;h=37d7c0d72b05b7ef907324589db997b353d54312;hb=298cffce2845fea10a2f0420a26db13ea9179e57;hp=417d149bc0d47feb4133f377224b1d615b647cf0;hpb=30eb586d06bc4d1ee7388dced1c20e530292aa93;p=rocksndiamonds.git

diff --git a/src/events.c b/src/events.c
index 417d149b..37d7c0d7 100644
--- a/src/events.c
+++ b/src/events.c
@@ -349,6 +349,7 @@ void EventLoop(void)
 
 void ClearAutoRepeatKeyEvents(void)
 {
+#if defined(TARGET_SDL2)
   while (PendingEvent())
   {
     Event next_event;
@@ -362,6 +363,7 @@ void ClearAutoRepeatKeyEvents(void)
     else
       break;
   }
+#endif
 }
 
 void ClearEventQueue(void)
@@ -2113,6 +2115,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 +2399,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)