From e6717b37ce51119352f6dadb2331a68855c8d692 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Wed, 16 Dec 2020 09:28:06 -0500
Subject: [PATCH] Fixed #4000

---
 desktop/src/mindustry/desktop/DesktopLauncher.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/desktop/src/mindustry/desktop/DesktopLauncher.java b/desktop/src/mindustry/desktop/DesktopLauncher.java
index 52d2d3cb69..99120a74df 100644
--- a/desktop/src/mindustry/desktop/DesktopLauncher.java
+++ b/desktop/src/mindustry/desktop/DesktopLauncher.java
@@ -125,9 +125,11 @@ public class DesktopLauncher extends ClientLauncher{
         boolean[] isShutdown = {false};
 
         Events.on(ClientLoadEvent.class, event -> {
-            player.name(SVars.net.friends.getPersonaName());
             Core.settings.defaults("name", SVars.net.friends.getPersonaName());
-            Core.settings.put("name", player.name);
+            if(player.name.isEmpty()){
+                player.name = SVars.net.friends.getPersonaName();
+                Core.settings.put("name", player.name);
+            }
             //update callbacks
             Core.app.addListener(new ApplicationListener(){
                 @Override