X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=0a674b4ce7ac2441415f211f113d2882f0559ec3;hb=613de640b2503cdeadef3411d71dac28e92525bf;hp=cb4e6d41820b938085efb01810ef0fd4f6e42362;hpb=5e30707f778ec0ce59045e9f19b0af45aa4cf693;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index cb4e6d41..0a674b4c 100644
--- a/src/files.c
+++ b/src/files.c
@@ -9175,7 +9175,7 @@ static struct TokenInfo options_setup_tokens[] =
   },
 };
 
-static char *get_corrected_login_name(char *login_name)
+static char *get_corrected_player_name(char *login_name)
 {
   // needed because player name must be a fixed length string
   char *login_name_new = checked_malloc(MAX_PLAYER_NAME_LEN + 1);
@@ -9192,9 +9192,10 @@ static char *get_corrected_login_name(char *login_name)
 
 static void setSetupInfoToDefaults(struct SetupInfo *si)
 {
+  char *player_name = (user.nr == 0 ? getLoginName() : EMPTY_PLAYER_NAME);
   int i;
 
-  si->player_name = get_corrected_login_name(getLoginName());
+  si->player_name = get_corrected_player_name(player_name);
 
   si->multiple_users = TRUE;
 
@@ -9682,7 +9683,7 @@ void LoadUserNames(void)
     {
       char *player_name = getHashEntry(setup_file_hash, "player_name");
 
-      global.user_names[i] = get_corrected_login_name(player_name);
+      global.user_names[i] = get_corrected_player_name(player_name);
 
       freeSetupFileHash(setup_file_hash);
     }
@@ -9715,7 +9716,7 @@ static void LoadSetup_SpecialPostProcessing(void)
   char *player_name_new;
 
   // needed to work around problems with fixed length strings
-  player_name_new = get_corrected_login_name(setup.player_name);
+  player_name_new = get_corrected_player_name(setup.player_name);
   free(setup.player_name);
   setup.player_name = player_name_new;