From 60d48242f6d24fff123482249b8af8e4dca54ba2 Mon Sep 17 00:00:00 2001 From: Mason Sciotti Date: Fri, 30 Mar 2018 15:20:30 -0700 Subject: [PATCH] Testing testing --- src/discord_rpc.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/discord_rpc.cpp b/src/discord_rpc.cpp index f16b910..3dbe95e 100644 --- a/src/discord_rpc.cpp +++ b/src/discord_rpc.cpp @@ -49,6 +49,7 @@ struct JoinRequest { static RpcConnection* Connection{nullptr}; static DiscordEventHandlers Handlers{}; static std::atomic_bool WasJustConnected{false}; +static std::atomic_bool ReceivedReady{false}; static std::atomic_bool WasJustDisconnected{false}; static std::atomic_bool GotErrorMessage{false}; static std::atomic_bool WasJoinGame{false}; @@ -208,8 +209,8 @@ static void Discord_UpdateConnection(void) JoinAskQueue.CommitAdd(); } } - else if (strcmp(evtName, "READY") == 0) { + ReceivedReady.exchange(true); auto user = GetObjMember(data, "user"); auto userId = GetStrMember(user, "id"); auto username = GetStrMember(user, "username"); @@ -396,6 +397,17 @@ extern "C" DISCORD_EXPORT void Discord_RunCallbacks(void) } if (WasJustConnected.exchange(false)) { + std::lock_guard guard(HandlerMutex); + if (Handlers.ready) { + DiscordJoinRequest djr{"1234", + "aaaaaaaa", + "qwdqd", + "qwqdqwdqd"}; + Handlers.ready(&djr); + } + } + + if (ReceivedReady.exchange(false)) { std::lock_guard guard(HandlerMutex); if (Handlers.ready) { DiscordJoinRequest djr{connectedUser.userId,