X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=fb6b4e76976952219a1015710389d65fe6dbb38a;hp=0cb8a2b017ab8d05e10f0f757a353c17d4d158ab;hb=e62173f0d73ba575738b04300f5408b2dfdc3188;hpb=9a428699f518bb0b4982e203f809963fd4ebe6da

diff --git a/src/screens.c b/src/screens.c
index 0cb8a2b0..fb6b4e76 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -4356,12 +4356,17 @@ static void setTypeNameValues(char *name, struct TextPosInfo *pos,
     // temporarily change active user to edited user
     user.nr = type_name_nr;
 
-    // load setup of edited user (unless creating user with current setup)
-    if (!create_user ||
-	!Request("Use current setup values for the new player?", REQ_ASK))
-      LoadSetup();
-    else
+    if (create_user &&
+        Request("Use current setup values for the new player?", REQ_ASK))
+    {
+      // use current setup values for new user, but create new player UUID
       setup.player_uuid = getStringCopy(getUUID());
+    }
+    else
+    {
+      // load setup for existing user (or start with defaults for new user)
+      LoadSetup();
+    }
   }
 
   char *setup_filename = getSetupFilename();