swapped condition logic to improve code readability

[rocksndiamonds.git] / src / screens.c

diff --git a/src/screens.c b/src/screens.c
index d648b00e914a95b3a618cf3ce23b0c1a891ca85f..fb6b4e76976952219a1015710389d65fe6dbb38a 100644 (file)
--- a/src/screens.c
+++ b/src/screens.c
@@ -4356,10 +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))
+    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();