Modify state formatting

Lpsd · Oct 12, 2023 · 061ef41 · 061ef41
1 parent 55d6b76
commit 061ef41
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/Client/core/CSettings.cpp b/Client/core/CSettings.cpp
@@ -3457,7 +3457,17 @@ void CSettings::SaveData()
         auto discord = g_pCore->GetDiscord();
 
         if (discord)
-            discord->SetPresenceState(CCore::GetSingleton().IsConnected() ? SString("In-game (%s)", g_pCore->GetLastConnectedServerName()) : "Main menu", false);
+        {
+            SString state = "Main menu";
+
+            if (CCore::GetSingleton().IsConnected())
+            {
+                SString serverName = g_pCore->GetLastConnectedServerName();
+                state = (serverName.length() > 0) ? SString("In-game (%s)", serverName) : "In-game";
+            }
+
+            discord->SetPresenceState(state, false);
+        }
     }
 
     // Grass

diff --git a/Client/mods/deathmatch/logic/CPacketHandler.cpp b/Client/mods/deathmatch/logic/CPacketHandler.cpp
@@ -474,8 +474,11 @@ void CPacketHandler::Packet_ServerJoined(NetBitStreamInterface& bitStream)
             std::string serverName;
             bitStream.ReadString(serverName);
 
-            g_pCore->SetLastConnectedServerName(serverName);
-            discord->SetPresenceState(SString("In-game (%s)", serverName), false);
+            if (serverName.length() > 0)
+            {
+                g_pCore->SetLastConnectedServerName(serverName);
+                discord->SetPresenceState(SString("In-game (%s)", serverName), false);
+            }
         }
     }