X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=e9be137bb2ccf9a6c4e340ef1a8ffd4406241cc6;hb=23cca722018a5939f8a7e8080618e45ee52f7e90;hp=a5f249eef9e806895625ce487f99ce4320bb820f;hpb=07d66a0f9f6cd39223fad0ffdb8ce65974e03d20;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index a5f249ee..e9be137b 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4018,6 +4018,7 @@ void HandleInfoScreen(int mx, int my, int dx, int dy, int button)
 
 static TreeInfo *type_name_node = NULL;
 static char type_name_last[MAX_PLAYER_NAME_LEN + 1] = { 0 };
+static int type_name_nr = 0;
 
 static void drawTypeNameText(char *name, struct TextPosInfo *pos,
 			      boolean active)
@@ -4097,9 +4098,7 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
     pos->font = (node->color == FC_RED ? FONT_INPUT_1 : FONT_VALUE_OLD);
   }
 
-  if (!changed)
-    return;
-
+  // if player name not changed, no further action required
   if (strEqual(name, type_name_last))
     return;
 
@@ -4107,10 +4106,10 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
 
   if (setup.multiple_users)
   {
-    int edit_user_nr = posTreeInfo(node);
+    type_name_nr = posTreeInfo(node);
 
     // change name of edited user in global list of user names
-    setString(&global.user_names[edit_user_nr], name);
+    setString(&global.user_names[type_name_nr], name);
 
     // change name of edited user in local menu tree structure
     setString(&node->name, name);
@@ -4120,7 +4119,7 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
     SaveSetup();
 
     // temporarily change active user to edited user
-    user.nr = edit_user_nr;
+    user.nr = type_name_nr;
 
     // load setup of edited user
     LoadSetup();
@@ -4194,6 +4193,9 @@ static void HandleTypeNameExt(boolean initialize, Key key)
     StopTextInput();
 
     SetGameStatus(game_status_last_screen);
+
+    if (game_status == GAME_MODE_MAIN)
+      InitializeMainControls();
   }
 }