Skip to content

Commit fa2ee64

Browse files
Adjust DiscordManager class
1 parent 8b3064b commit fa2ee64

2 files changed

Lines changed: 11 additions & 20 deletions

File tree

src/DiscordManager.cpp

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DiscordManager::DiscordManager()
77

88
DiscordManager::~DiscordManager()
99
{
10-
Discord_Shutdown();
10+
Dispose();
1111
}
1212

1313
void DiscordManager::Initialize()
@@ -18,7 +18,7 @@ void DiscordManager::Initialize()
1818
handlers.ready = &HandleDiscordReady;
1919
handlers.disconnected = &HandleDiscordDisconnected;
2020
handlers.errored = &HandleDiscordError;
21-
Discord_Initialize(AppID, NULL, 1, NULL);
21+
Discord_Initialize(appID, NULL, 1, NULL);
2222
UpdateDiscordPresence();
2323
LOGMSG("Discord RPC is running");
2424
}
@@ -45,18 +45,10 @@ void DiscordManager::HandleDiscordError(int errcode, const char* message)
4545

4646
void DiscordManager::UpdateDiscordPresence()
4747
{
48-
if (SendPresence)
49-
{
50-
char buffer[256];
51-
DiscordRichPresence discordPresence;
52-
memset(&discordPresence, 0, sizeof(discordPresence));
53-
discordPresence.state = state.toStdString().c_str();
54-
discordPresence.details = details.toStdString().c_str();
55-
discordPresence.instance = 0;
56-
Discord_UpdatePresence(&discordPresence);
57-
}
58-
else
59-
{
60-
Discord_ClearPresence();
61-
}
48+
DiscordRichPresence discordPresence;
49+
memset(&discordPresence, 0, sizeof(discordPresence));
50+
discordPresence.state = state;
51+
discordPresence.details = details;
52+
discordPresence.instance = 0;
53+
Discord_UpdatePresence(&discordPresence);
6254
}

src/DiscordManager.hpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@
88
class DiscordManager final
99
{
1010
private: // Data
11-
QString state = "Editing hotkeys";
12-
QString details = "";
11+
const char* appID = "1476177039966081097";
12+
const char* state = "Editing hotkeys";
13+
const char* details = "";
1314
public:
1415
inline static std::unique_ptr<DiscordManager> Instance = std::make_unique<DiscordManager>();
15-
const char* AppID = "1476177039966081097";
16-
const int SendPresence = 1;
1716

1817
private: // Methods
1918
static void HandleDiscordReady(const DiscordUser* connectedUser);

0 commit comments

Comments
 (0)