alterware/discord-rpc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Testing testing

Browse Source
This commit is contained in:
Mason Sciotti 2018-03-30 15:20:30 -07:00
parent afdc5fd23a
commit 60d48242f6
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/discord_rpc.cpp
View File

@ -49,6 +49,7 @@ struct JoinRequest {
static RpcConnection* Connection{nullptr}; static RpcConnection* Connection{nullptr};
static DiscordEventHandlers Handlers{}; static DiscordEventHandlers Handlers{};
static std::atomic_bool WasJustConnected{false}; static std::atomic_bool WasJustConnected{false};
static std::atomic_bool ReceivedReady{false};
static std::atomic_bool WasJustDisconnected{false}; static std::atomic_bool WasJustDisconnected{false};
static std::atomic_bool GotErrorMessage{false}; static std::atomic_bool GotErrorMessage{false};
static std::atomic_bool WasJoinGame{false}; static std::atomic_bool WasJoinGame{false};
@ -208,8 +209,8 @@ static void Discord_UpdateConnection(void)
JoinAskQueue.CommitAdd(); JoinAskQueue.CommitAdd();
} }
} }
else if (strcmp(evtName, "READY") == 0) { else if (strcmp(evtName, "READY") == 0) {
ReceivedReady.exchange(true);
auto user = GetObjMember(data, "user"); auto user = GetObjMember(data, "user");
auto userId = GetStrMember(user, "id"); auto userId = GetStrMember(user, "id");
auto username = GetStrMember(user, "username"); auto username = GetStrMember(user, "username");
@ -396,6 +397,17 @@ extern "C" DISCORD_EXPORT void Discord_RunCallbacks(void)
} }
if (WasJustConnected.exchange(false)) { if (WasJustConnected.exchange(false)) {
std::lock_guard<std::mutex> guard(HandlerMutex);
if (Handlers.ready) {
DiscordJoinRequest djr{"1234",
"aaaaaaaa",
"qwdqd",
"qwqdqwdqd"};
Handlers.ready(&djr);
}
}
if (ReceivedReady.exchange(false)) {
std::lock_guard<std::mutex> guard(HandlerMutex); std::lock_guard<std::mutex> guard(HandlerMutex);
if (Handlers.ready) { if (Handlers.ready) {
DiscordJoinRequest djr{connectedUser.userId, DiscordJoinRequest djr{connectedUser.userId,