mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-01-09 02:19:45 +01:00
Code Issues Releases Wiki Activity

Avoid segfault if Discord is not detected, remove useless headerfiles

Browse source
This commit is contained in:
Buggem's Fedora PC 2024-12-13 14:28:30 +11:00
parent ce111cf6c6
commit 7d3e7db2b7
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
desktop_version/src/DiscordNetwork.c
View file

@ -4,12 +4,8 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include <stdbool.h>
#include <SDL.h> #include <SDL.h>
#ifdef _WIN32
#include <Windows.h>
#else
#include <unistd.h>
#endif
#include "Vlogging.h" #include "Vlogging.h"
@ -38,6 +34,7 @@ struct DISCORD_application {
struct DiscordActivity activity; struct DiscordActivity activity;
bool discordNotDetected = false;
int discordCrashes = 0; // This is here to ensure we do not get stuck in a theoratical softlock of opening and crashing Discord instances. int discordCrashes = 0; // This is here to ensure we do not get stuck in a theoratical softlock of opening and crashing Discord instances.
static void* libHandle = NULL; static void* libHandle = NULL;
@ -103,6 +100,12 @@ int32_t DISCORD_init(void)
return 1; return 1;
} }
if(app.core == NULL)
{
discordNotDetected = true;
return 0;
}
SDL_strlcpy(activity.assets.large_image, "vvvvvv", sizeof(activity.assets.large_image)); SDL_strlcpy(activity.assets.large_image, "vvvvvv", sizeof(activity.assets.large_image));
SDL_strlcpy(activity.assets.large_text, "Outside Dimension VVVVVV", sizeof(activity.assets.large_text)); SDL_strlcpy(activity.assets.large_text, "Outside Dimension VVVVVV", sizeof(activity.assets.large_text));
@ -116,6 +119,10 @@ int32_t DISCORD_init(void)
} }
void DISCORD_REQUIRE(int x) { void DISCORD_REQUIRE(int x) {
if(discordNotDetected)
{
return;
}
if(discordCrashes > DISCORD_CRASH_LIMIT) if(discordCrashes > DISCORD_CRASH_LIMIT)
{ {
DISCORD_shutdown(); DISCORD_shutdown();