.gitmodules

@@ -1,3 +0,0 @@
-[submodule "v2rayN/GlobalHotKeys"]
-	path = v2rayN/GlobalHotKeys
-	url = https://github.com/2dust/GlobalHotKeys

v2rayN/Directory.Packages.props

@@ -9,8 +9,9 @@
     <PackageVersion Include="Avalonia.Desktop" Version="11.2.4" />
     <PackageVersion Include="Avalonia.Diagnostics" Version="11.2.4" />
     <PackageVersion Include="Avalonia.ReactiveUI" Version="11.2.4" />
-    <PackageVersion Include="CliWrap" Version="3.8.1" />
+    <PackageVersion Include="CliWrap" Version="3.8.0" />
     <PackageVersion Include="Downloader" Version="3.3.3" />
+    <PackageVersion Include="GlobalHotKeys.Windows" Version="0.1.0" />
     <PackageVersion Include="H.NotifyIcon.Wpf" Version="2.2.0" />
     <PackageVersion Include="MaterialDesignThemes" Version="5.2.1" />
     <PackageVersion Include="MessageBox.Avalonia" Version="3.2.0" />
@@ -22,9 +23,9 @@
     <PackageVersion Include="Semi.Avalonia.DataGrid" Version="11.2.1.4" />
     <PackageVersion Include="Splat.NLog" Version="15.3.1" />
     <PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
-    <PackageVersion Include="TaskScheduler" Version="2.12.0" />
+    <PackageVersion Include="TaskScheduler" Version="2.11.0" />
     <PackageVersion Include="WebDav.Client" Version="2.8.0" />
     <PackageVersion Include="YamlDotNet" Version="16.3.0" />
     <PackageVersion Include="ZXing.Net.Bindings.SkiaSharp" Version="0.16.14" />
   </ItemGroup>
-</Project>
+</Project>

v2rayN/GlobalHotKeys

@@ -1 +0,0 @@
-Subproject commit 35901e2eaa40bc697e3864cb63812fb355af4087

v2rayN/ServiceLib/Common/ProcUtils.cs

@@ -20,13 +20,9 @@ public static class ProcUtils
         try
         {
             if (fileName.Contains(' '))
-            {
                 fileName = fileName.AppendQuotes();
-            }
             if (arguments.Contains(' '))
-            {
                 arguments = arguments.AppendQuotes();
-            }
 
             Process proc = new()
             {

v2rayN/ServiceLib/Handler/CoreHandler.cs

@@ -253,7 +253,7 @@ namespace ServiceLib.Handler
                     StartInfo = new()
                     {
                         FileName = fileName,
-                        Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath).AppendQuotes() : configPath),
+                        Arguments = string.Format(coreInfo.Arguments, coreInfo.AbsolutePath ? Utils.GetBinConfigPath(configPath) : configPath),
                         WorkingDirectory = Utils.GetBinConfigPath(),
                         UseShellExecute = false,
                         RedirectStandardOutput = displayLog,

v2rayN/v2rayN.Desktop/Handler/HotkeyHandler.cs

@@ -3,6 +3,7 @@ using Avalonia.Input;
 using Avalonia.ReactiveUI;
 using Avalonia.Win32.Input;
 using GlobalHotKeys;
+using GlobalHotKeys.Native.Types;
 
 namespace v2rayN.Desktop.Handler
 {
@@ -23,6 +24,7 @@ namespace v2rayN.Desktop.Handler
         {
             _config = config;
             _updateFunc = updateFunc;
+            _hotKeyManager = new GlobalHotKeys.HotKeyManager();
 
             Register();
         }
@@ -34,11 +36,6 @@ namespace v2rayN.Desktop.Handler
 
         private void Register()
         {
-            if (_config.GlobalHotkeys.Any(t => t.KeyCode > 0) == false)
-            {
-                return;
-            }
-            _hotKeyManager ??= new GlobalHotKeys.HotKeyManager();
             _hotkeyTriggerDic.Clear();
 
             foreach (var item in _config.GlobalHotkeys)

v2rayN/v2rayN.Desktop/v2rayN.Desktop.csproj

@@ -26,12 +26,12 @@
 		<PackageReference Include="ReactiveUI.Fody">
 			<TreatAsUsed>true</TreatAsUsed>
 		</PackageReference>
+        <PackageReference Include="GlobalHotKeys.Windows" />
 	</ItemGroup>
 
 	<ItemGroup>
 		<ProjectCapability Include="Avalonia" />
 		<AvaloniaResource Include="Assets\**" />
-		<ProjectReference Include="..\GlobalHotKeys\src\GlobalHotKeys\GlobalHotKeys.csproj" />
 		<ProjectReference Include="..\ServiceLib\ServiceLib.csproj" />
 	</ItemGroup>
 

v2rayN/v2rayN.sln

@@ -11,8 +11,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "v2rayN.Desktop", "v2rayN.De
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AmazTool", "AmazTool\AmazTool.csproj", "{47D68B1C-601C-4C69-873B-FFF0DC13EC97}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GlobalHotKeys", "GlobalHotKeys\src\GlobalHotKeys\GlobalHotKeys.csproj", "{CB3DE54F-3A26-AE02-1299-311132C32156}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,10 +33,6 @@ Global
 		{47D68B1C-601C-4C69-873B-FFF0DC13EC97}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{47D68B1C-601C-4C69-873B-FFF0DC13EC97}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{47D68B1C-601C-4C69-873B-FFF0DC13EC97}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CB3DE54F-3A26-AE02-1299-311132C32156}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CB3DE54F-3A26-AE02-1299-311132C32156}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CB3DE54F-3A26-AE02-1299-311132C32156}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CB3DE54F-3A26-AE02-1299-311132C32156}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE