fix buttons if there aren't 2 of them

harmonytf · Nov 2, 2023 · 36b372a · 36b372a
1 parent af53eda
commit 36b372a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 13 deletions.
diff --git a/examples/send-presence/send-presence.c b/examples/send-presence/send-presence.c
@@ -59,8 +59,10 @@ static void updateDiscordPresence()
             {.label = "Test 2", .url = "https://discord.gg/fortnite"},
         };
 
-        if (SendButtons)
+        if (SendButtons) {
             discordPresence.buttons = buttons;
+            discordPresence.numButtons = sizeof(buttons) / sizeof(DiscordButton);
+        }
 
         Discord_UpdatePresence(&discordPresence);
     }

diff --git a/include/discord_rpc.h b/include/discord_rpc.h
@@ -45,6 +45,7 @@ typedef struct DiscordRichPresence {
     const char* joinSecret;     /* max 128 bytes */
     const char* spectateSecret; /* max 128 bytes */
     int8_t instance;
+    uint8_t numButtons;
     const DiscordButton* buttons;
 } DiscordRichPresence;
 

diff --git a/src/serialization.cpp b/src/serialization.cpp
@@ -164,24 +164,22 @@ size_t JsonWriteRichPresenceObj(char* dest,
                 writer.Key("instance");
                 writer.Bool(presence->instance != 0);
 
-                if (presence->buttons) {
+                if (presence->buttons && presence->numButtons > 0) {
                     const auto btns = presence->buttons;
                     WriteArray buttons(writer, "buttons");
 
-                    if (btns[0].label[0]) {
-                        WriteObject button0(writer);
-                        WriteKey(writer, "url");
-                        writer.String(btns[0].url);
-                        WriteKey(writer, "label");
-                        writer.String(btns[0].label);
-                    }
+                    for (uint8_t i = 0; i < presence->numButtons; i++) {
+
+                        const DiscordButton& btn = presence->buttons[i];
+
+                        if (!btn.label || !btn.label[0])
+                            continue;
 
-                    if (btns[1].label[0]) {
-                        WriteObject button1(writer);
+                        WriteObject button(writer);
                         WriteKey(writer, "url");
-                        writer.String(btns[1].url);
+                        writer.String(btn.url);
                         WriteKey(writer, "label");
-                        writer.String(btns[1].label);
+                        writer.String(btn.label);
                     }
                 }
             }