From ee078303eb1be84ad1bc6333234314c686233505 Mon Sep 17 00:00:00 2001 From: Edo Date: Thu, 9 Feb 2023 14:30:31 +0000 Subject: [PATCH] [Discord]: Add checks for nullptr pointers to be sure (#764) --- src/Components/Modules/Discord.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Components/Modules/Discord.cpp b/src/Components/Modules/Discord.cpp index 12e8fd4f..fca6ff39 100644 --- a/src/Components/Modules/Discord.cpp +++ b/src/Components/Modules/Discord.cpp @@ -65,7 +65,7 @@ namespace Components { const auto* value = Game::StringTable_GetColumnValueForRow(table, row, 1); const auto* localize = Game::DB_FindXAssetHeader(Game::ASSET_TYPE_LOCALIZE_ENTRY, value).localize; - DiscordPresence.details = Utils::String::Format("{} on {}", localize->value, map); + DiscordPresence.details = Utils::String::Format("{} on {}", localize ? localize->value : "Team Deathmatch", map); } else { @@ -91,7 +91,7 @@ namespace Components DiscordPresence.partyId = Utils::String::VA("%zu", hashFn(address) ^ GetDiscordNonce()); DiscordPresence.joinSecret = address.getCString(); - DiscordPresence.partySize = Game::cgArray[0].snap->numClients; + DiscordPresence.partySize = Game::cgArray[0].snap ? Game::cgArray[0].snap->numClients : 1; DiscordPresence.partyMax = Party::GetMaxClients(); if (!DiscordPresence.startTimestamp)