Fix lost selection when selecting wrong player

VladimirKhil · Dec 20, 2023 · 2ab8529 · 2ab8529
1 parent f795757
commit 2ab8529
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/src/SICore/SICore/Clients/Player/Player.cs b/src/SICore/SICore/Clients/Player/Player.cs
@@ -318,7 +318,12 @@ protected override async ValueTask OnSystemMessageReceivedAsync(string[] mparams
                     {
                         ClientData.Players[i].CanBeSelected = mparams[i + 1] == "+";
                         int num = i;
-                        ClientData.Players[i].SelectionCallback = player => { _viewerActions.SendMessageWithArgs(Messages.Cat, num); Clear(); };
+
+                        ClientData.Players[i].SelectionCallback = player =>
+                        {
+                            _viewerActions.SendMessageWithArgs(Messages.Cat, num);
+                            Clear();
+                        };
                     }
 
                     ClientData.Hint = LO[nameof(R.HintSelectCatPlayer)];

diff --git a/src/SIGame/SIGame/View/PersonView.xaml b/src/SIGame/SIGame/View/PersonView.xaml
@@ -105,6 +105,10 @@
                     <Setter Property="BorderBrush" Value="Gray" />
                 </DataTrigger>
 
+                <DataTrigger Binding="{Binding CanBeSelected}" Value="False">
+                    <Setter Property="IsEnabled" Value="False" />
+                </DataTrigger>
+
                 <DataTrigger Binding="{Binding CanBeSelected}" Value="True">
                     <Setter Property="BorderBrush" Value="Cyan" />
                     <Setter Property="Cursor" Value="Hand" />