1
0
mirror of https://github.com/ppy/osu.git synced 2024-05-15 00:20:26 +08:00

Merge branch 'master' into release

This commit is contained in:
Dean Herbert 2024-04-13 14:08:14 +08:00
commit fdf1ab56b2
No known key found for this signature in database

View File

@ -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;