do not change player name if it is undefined or empty

n-at · Sep 3, 2023 · 27b7f76 · 27b7f76
1 parent 04f0650
commit 27b7f76
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/assets/netplay-ui-client.js b/assets/netplay-ui-client.js
@@ -341,7 +341,7 @@
         //send previously saved client name
         const netplayName = netplay.getName();
         const savedName = window.NetplayLoadClientName(netplayName);
-        if (netplayName !== savedName) {
+        if (savedName && netplayName !== savedName) {
             netplay.setName(savedName);
         }
 

diff --git a/assets/netplay-ui-host.js b/assets/netplay-ui-host.js
@@ -49,7 +49,7 @@
     function wsGreeting() {
         const netplayName = netplay.getName();
         const savedName = window.NetplayLoadClientName(netplayName);
-        if (netplayName !== savedName) {
+        if (savedName && netplayName !== savedName) {
             netplay.setName(savedName);
         }
 

diff --git a/templates/includes/play_default_options.twig b/templates/includes/play_default_options.twig
@@ -24,11 +24,21 @@
         const netplayControls = window.localStorage.playtimeNetplayControls;
         const netplayVirtualGamepad = window.localStorage.playtimeNetplayVirtualGamepad;
         window.localStorage.clear();
-        window.localStorage.__dark_theme = darkTheme;
-        window.localStorage.playtimeNetplayName = netplayName;
-        window.localStorage.playtimeNetplayPlayer = netplayPlayer;
-        window.localStorage.playtimeNetplayControls = netplayControls;
-        window.localStorage.playtimeNetplayVirtualGamepad = netplayVirtualGamepad;
+        if (darkTheme) {
+            window.localStorage.__dark_theme = darkTheme;
+        }
+        if (netplayName) {
+            window.localStorage.playtimeNetplayName = netplayName;
+        }
+        if (netplayPlayer) {
+            window.localStorage.playtimeNetplayPlayer = netplayPlayer;
+        }
+        if (netplayControls) {
+            window.localStorage.playtimeNetplayControls = netplayControls;
+        }
+        if (netplayVirtualGamepad) {
+            window.localStorage.playtimeNetplayVirtualGamepad = netplayVirtualGamepad;
+        }
 
         const coreSettings = {
             settings: {