diff --git a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs index aee8357cdc..a0688523f1 100644 --- a/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs +++ b/Content.Client/PDA/Ringer/RingerBoundUserInterface.cs @@ -1,7 +1,7 @@ using Content.Shared.PDA; using Content.Shared.PDA.Ringer; using JetBrains.Annotations; -using Robust.Client.GameObjects; +using Robust.Shared.Timing; namespace Content.Client.PDA.Ringer { @@ -29,9 +29,17 @@ namespace Content.Client.PDA.Ringer _menu.SetRingerButton.OnPressed += _ => { - if (!TryGetRingtone(out var ringtone)) return; + if (!TryGetRingtone(out var ringtone)) + return; SendMessage(new RingerSetRingtoneMessage(ringtone)); + _menu.SetRingerButton.Disabled = true; + + Timer.Spawn(333, () => + { + if (_menu is { Disposed: false, SetRingerButton: { Disposed: false } ringer}) + ringer.Disabled = false; + }); }; } @@ -74,7 +82,7 @@ namespace Content.Client.PDA.Ringer } - _menu.TestRingerButton.Visible = !msg.IsPlaying; + _menu.TestRingerButton.Disabled = msg.IsPlaying; } diff --git a/Content.Client/PDA/Ringer/RingtoneMenu.xaml b/Content.Client/PDA/Ringer/RingtoneMenu.xaml index a361a58dd2..2fff0ab1b5 100644 --- a/Content.Client/PDA/Ringer/RingtoneMenu.xaml +++ b/Content.Client/PDA/Ringer/RingtoneMenu.xaml @@ -79,12 +79,14 @@ Access="Public" Text="{Loc 'comp-ringer-ui-test-ringtone-button'}" HorizontalAlignment="Center" - VerticalAlignment="Center" /> + VerticalAlignment="Center" + StyleClasses="OpenRight" />