From 0085e0a507f88d5be15353c8597ef91f9dfbca95 Mon Sep 17 00:00:00 2001
From: DHR60 <dehongren60@gmail.com>
Date: Sat, 6 Sep 2025 19:19:34 +0800
Subject: [PATCH] Fix

---
 .../Views/ProfilesSelectWindow.axaml              |  4 ++++
 .../Views/ProfilesSelectWindow.axaml.cs           | 15 ++++++++++++++-
 v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml     |  1 +
 v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs  | 15 +++++++++++++++
 4 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
index 9b41bc90..a50f0d7f 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml
@@ -27,6 +27,7 @@
             <Button
                 x:Name="btnSave"
                 Width="100"
+                Click="BtnSave_Click"
                 Content="{x:Static resx:ResUI.TbConfirm}" />
             <Button
                 x:Name="btnCancel"
@@ -83,6 +84,9 @@
                     IsReadOnly="True"
                     ItemsSource="{Binding ProfileItems}"
                     SelectionMode="Single">
+                    <DataGrid.KeyBindings>
+                        <KeyBinding Command="{Binding SelectFinish}" Gesture="Enter" />
+                    </DataGrid.KeyBindings>
                     <DataGrid.Columns>
                         <DataGridTextColumn
                             Width="80"
diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
index 5f17603e..8aafbd83 100644
--- a/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/ProfilesSelectWindow.axaml.cs
@@ -18,6 +18,7 @@ public partial class ProfilesSelectWindow : ReactiveWindow<ProfilesSelectViewMod
     private static Config _config;
 
     public Task<ProfileItem?> ProfileItem => GetFirstProfileItemAsync();
+    private bool _allowMultiSelect = false;
 
     public ProfilesSelectWindow()
     {
@@ -51,6 +52,7 @@ public partial class ProfilesSelectWindow : ReactiveWindow<ProfilesSelectViewMod
 
     public void AllowMultiSelect(bool allow)
     {
+        _allowMultiSelect = allow;
         if (allow)
         {
             lstProfiles.SelectionMode = DataGridSelectionMode.Extended;
@@ -113,7 +115,11 @@ public partial class ProfilesSelectWindow : ReactiveWindow<ProfilesSelectViewMod
         {
             if (e.Key == Key.A)
             {
-                lstProfiles.SelectAll();
+                if (_allowMultiSelect)
+                {
+                    lstProfiles.SelectAll();
+                }
+                e.Handled = true;
             }
         }
         else
@@ -121,6 +127,7 @@ public partial class ProfilesSelectWindow : ReactiveWindow<ProfilesSelectViewMod
             if (e.Key is Key.Enter or Key.Return)
             {
                 ViewModel?.SelectFinish();
+                e.Handled = true;
             }
         }
     }
@@ -157,4 +164,10 @@ public partial class ProfilesSelectWindow : ReactiveWindow<ProfilesSelectViewMod
         var item = await ViewModel?.GetProfileItem();
         return item;
     }
+    
+    private void BtnSave_Click(object sender, RoutedEventArgs e)
+    {
+        // Trigger selection finalize when Confirm is clicked
+        ViewModel?.SelectFinish();
+    }
 }
diff --git a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml
index 214e1899..c8d7112b 100644
--- a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml
+++ b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml
@@ -35,6 +35,7 @@
                 Width="100"
                 Content="{x:Static resx:ResUI.TbConfirm}"
                 IsDefault="True"
+                Click="BtnSave_Click"
                 Style="{StaticResource DefButton}" />
             <Button
                 x:Name="btnCancel"
diff --git a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
index 56ea5f90..58c903bb 100644
--- a/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesSelectWindow.xaml.cs
@@ -16,6 +16,7 @@ public partial class ProfilesSelectWindow
     private static Config _config;
 
     public Task<ProfileItem?> ProfileItem => GetFirstProfileItemAsync();
+    private bool _allowMultiSelect = false;
 
     public ProfilesSelectWindow()
     {
@@ -46,6 +47,7 @@ public partial class ProfilesSelectWindow
 
     public void AllowMultiSelect(bool allow)
     {
+        _allowMultiSelect = allow;
         if (allow)
         {
             lstProfiles.SelectionMode = DataGridSelectionMode.Extended;
@@ -108,6 +110,10 @@ public partial class ProfilesSelectWindow
 
     private void menuSelectAll_Click(object sender, RoutedEventArgs e)
     {
+        if (!_allowMultiSelect)
+        {
+            return;
+        }
         lstProfiles.SelectAll();
     }
 
@@ -119,6 +125,7 @@ public partial class ProfilesSelectWindow
             {
                 case Key.A:
                     menuSelectAll_Click(null, null);
+                    e.Handled = true;
                     break;
             }
         }
@@ -127,6 +134,7 @@ public partial class ProfilesSelectWindow
             if (e.Key is Key.Enter or Key.Return)
             {
                 ViewModel?.SelectFinish();
+                e.Handled = true;
             }
         }
     }
@@ -156,6 +164,7 @@ public partial class ProfilesSelectWindow
         if (e.Key is Key.Enter or Key.Return)
         {
             ViewModel?.RefreshServers();
+            e.Handled = true;
         }
     }
 
@@ -164,5 +173,11 @@ public partial class ProfilesSelectWindow
         var item = await ViewModel?.GetProfileItem();
         return item;
     }
+
+    private void BtnSave_Click(object sender, RoutedEventArgs e)
+    {
+        // Trigger selection finalize when Confirm is clicked
+        ViewModel?.SelectFinish();
+    }
     #endregion Event
 }