Unity ajt fix

discord · Nov 2, 2017 · 3bdb88d · 3bdb88d
1 parent aa79c70
commit 3bdb88d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/examples/button-clicker/Assets/DiscordRpc.cs b/examples/button-clicker/Assets/DiscordRpc.cs
@@ -50,14 +50,11 @@ public struct RichPresence
         public bool instance;
     }
 
-    [StructLayout(LayoutKind.Sequential, CharSet = CharSet.Ansi)]
+    [System.Serializable]
     public struct JoinRequest
     {
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 24)]
         public string userId;
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 48)]
         public string username;
-        [MarshalAs(UnmanagedType.ByValTStr, SizeConst = 128)]
         public string avatar;
     }
 

diff --git a/examples/button-clicker/Assets/Resources/discord-rpc.dll b/examples/button-clicker/Assets/Resources/discord-rpc.dll
diff --git a/include/discord-rpc.h b/include/discord-rpc.h
@@ -42,9 +42,9 @@ typedef struct DiscordRichPresence {
 } DiscordRichPresence;
 
 typedef struct DiscordJoinRequest {
-    char userId[24];
-    char username[48];
-    char avatar[128];
+    const char* userId;
+    const char* username;
+    const char* avatar;
 } DiscordJoinRequest;
 
 typedef struct DiscordEventHandlers {

diff --git a/src/discord-rpc.cpp b/src/discord-rpc.cpp
@@ -32,6 +32,12 @@ struct QueuedMessage {
     }
 };
 
+struct JoinRequest {
+    char userId[24];
+    char username[48];
+    char avatar[128];
+};
+
 static RpcConnection* Connection{nullptr};
 static DiscordEventHandlers Handlers{};
 static std::atomic_bool WasJustConnected{false};
@@ -48,7 +54,7 @@ static char LastDisconnectErrorMessage[256];
 static std::mutex PresenceMutex;
 static QueuedMessage QueuedPresence{};
 static MsgQueue<QueuedMessage, MessageQueueSize> SendQueue;
-static MsgQueue<DiscordJoinRequest, JoinQueueSize> JoinAskQueue;
+static MsgQueue<JoinRequest, JoinQueueSize> JoinAskQueue;
 
 // We want to auto connect, and retry on failure, but not as fast as possible. This does expoential
 // backoff from 0.5 seconds to 1 minute
@@ -353,7 +359,8 @@ extern "C" DISCORD_EXPORT void Discord_RunCallbacks()
     while (JoinAskQueue.HavePendingSends()) {
         auto req = JoinAskQueue.GetNextSendMessage();
         if (Handlers.joinRequest) {
-            Handlers.joinRequest(req);
+            DiscordJoinRequest djr{req->userId, req->username, req->avatar};
+            Handlers.joinRequest(&djr);
         }
         JoinAskQueue.CommitSend();
     }