Merge branch 'master' into release

Merge pull request #27839 from smoogipoo/fix-macos-crash
Fix crash when entering multiplayer on macOS
2026-05-17 14:53:19 +08:00 · 2024-04-13 14:08:14 +08:00 · 2024-04-13 12:54:00 +08:00 · 2024-04-13 13:17:06 +09:00
1 changed files with 3 additions and 1 deletions
@@ -205,7 +205,9 @@ namespace osu.Desktop
                    Password = room.Settings.Password,
                };

-                presence.Secrets.JoinSecret = JsonConvert.SerializeObject(roomSecret);
+                if (client.HasRegisteredUriScheme)
+                    presence.Secrets.JoinSecret = JsonConvert.SerializeObject(roomSecret);
+
                // discord cannot handle both secrets and buttons at the same time, so we need to choose something.
                // the multiplayer room seems more important.
                presence.Buttons = null;