From 1f8549045d17ae3253f7bf2da9d2137154fb2495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Sat, 2 Nov 2024 21:36:30 +0100 Subject: [PATCH] Default Discord rich presence to off --- Core/Config.cpp | 2 +- Core/Config.h | 2 +- UI/DiscordIntegration.cpp | 2 +- UI/GameSettingsScreen.cpp | 2 +- libretro/libretro.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Core/Config.cpp b/Core/Config.cpp index 801aa78567..14a8c98c7b 100644 --- a/Core/Config.cpp +++ b/Core/Config.cpp @@ -209,7 +209,7 @@ static const ConfigSetting generalSettings[] = { ConfigSetting("CheckForNewVersion", &g_Config.bCheckForNewVersion, true, CfgFlag::DEFAULT), ConfigSetting("Language", &g_Config.sLanguageIni, &DefaultLangRegion, CfgFlag::DEFAULT), ConfigSetting("ForceLagSync2", &g_Config.bForceLagSync, false, CfgFlag::PER_GAME), - ConfigSetting("DiscordPresence", &g_Config.bDiscordPresence, true, CfgFlag::DEFAULT), // Or maybe it makes sense to have it per-game? Race conditions abound... + ConfigSetting("DiscordRichPresence", &g_Config.bDiscordRichPresence, false, CfgFlag::DEFAULT), ConfigSetting("UISound", &g_Config.bUISound, false, CfgFlag::DEFAULT), ConfigSetting("DisableHTTPS", &g_Config.bDisableHTTPS, false, CfgFlag::DONT_SAVE), diff --git a/Core/Config.h b/Core/Config.h index 50eef87096..7055b09a78 100644 --- a/Core/Config.h +++ b/Core/Config.h @@ -145,7 +145,7 @@ public: std::string sIgnoreCompatSettings; - bool bDiscordPresence; // Enables setting the Discord presence to the current game (or menu) + bool bDiscordRichPresence; // Enables setting the Discord presence to the current game (or menu) // GFX int iGPUBackend; diff --git a/UI/DiscordIntegration.cpp b/UI/DiscordIntegration.cpp index 85458b1f32..a72caa782e 100644 --- a/UI/DiscordIntegration.cpp +++ b/UI/DiscordIntegration.cpp @@ -54,7 +54,7 @@ bool Discord::IsAvailable() { } bool Discord::IsEnabled() const { - return g_Config.bDiscordPresence; + return g_Config.bDiscordRichPresence; } void Discord::Init() { diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 31527e2beb..da0843d249 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -918,7 +918,7 @@ void GameSettingsScreen::CreateNetworkingSettings(UI::ViewGroup *networkingSetti } if (Discord::IsAvailable()) { - networkingSettings->Add(new CheckBox(&g_Config.bDiscordPresence, n->T("Send Discord Presence information"))); + networkingSettings->Add(new CheckBox(&g_Config.bDiscordRichPresence, n->T("Send Discord Presence information"))); } networkingSettings->Add(new ItemHeader(n->T("AdHoc Server"))); diff --git a/libretro/libretro.cpp b/libretro/libretro.cpp index 2dc6d936b8..eddb6d63a0 100644 --- a/libretro/libretro.cpp +++ b/libretro/libretro.cpp @@ -1272,7 +1272,7 @@ void retro_init(void) g_Config.flash0Directory = retro_base_dir / "flash0"; g_Config.internalDataDirectory = retro_base_dir; g_Config.bEnableNetworkChat = false; - g_Config.bDiscordPresence = false; + g_Config.bDiscordRichPresence = false; g_VFS.Register("", new DirectoryReader(retro_base_dir));