X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fevents.c;h=7b2ba984732b8fa857478f9bfc44d26d9259d041;hp=3346055722afa7566fa7f249ade02584d18a4f15;hb=0c08866e0fd391ec7e01562ad2ea3b5645ebfc13;hpb=1ad647eeb3f704b13dd9b08d06836e575cee38e0

diff --git a/src/events.c b/src/events.c
index 33460557..7b2ba984 100644
--- a/src/events.c
+++ b/src/events.c
@@ -2360,6 +2360,16 @@ void HandleJoystick(void)
     return;
   }
 
+  if (newbutton && (game_status == GAME_MODE_PSEUDO_TYPENAME ||
+		    anyTextGadgetActive()))
+  {
+    // leave name input in main menu or text input gadget
+    HandleKey(KSYM_Escape, KEY_PRESSED);
+    HandleKey(KSYM_Escape, KEY_RELEASED);
+
+    return;
+  }
+
   if (level.game_engine_type == GAME_ENGINE_TYPE_MM)
   {
     if (game_status == GAME_MODE_PLAYING)