github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

Bug fix 

https://github.com/2dust/v2rayN/issues/6160
pull/6190/head^2
2dust 2024-11-29 11:31:22 +08:00
parent 558e5bb340
commit 1ff4839be1
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
View File

@ -283,7 +283,6 @@ namespace ServiceLib.ViewModels
try try
{ {
Logging.SaveLog("MyAppExit Begin"); Logging.SaveLog("MyAppExit Begin");
//if (blWindowsShutDown)
await SysProxyHandler.UpdateSysProxy(_config, true); await SysProxyHandler.UpdateSysProxy(_config, true);
await ConfigHandler.SaveConfig(_config); await ConfigHandler.SaveConfig(_config);
@ -297,7 +296,10 @@ namespace ServiceLib.ViewModels
catch { } catch { }
finally finally
{ {
_updateView?.Invoke(EViewAction.Shutdown, null); if (!blWindowsShutDown)
{
_updateView?.Invoke(EViewAction.Shutdown, null);
}
} }
} }

8
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View File

@ -21,6 +21,7 @@ namespace v2rayN.Desktop.Views
private WindowNotificationManager? _manager; private WindowNotificationManager? _manager;
private CheckUpdateView? _checkUpdateView; private CheckUpdateView? _checkUpdateView;
private BackupAndRestoreView? _backupAndRestoreView; private BackupAndRestoreView? _backupAndRestoreView;
private bool _blCloseByUser = false;
public MainWindow() public MainWindow()
{ {
@ -279,6 +280,11 @@ namespace v2rayN.Desktop.Views
protected override async void OnClosing(WindowClosingEventArgs e) protected override async void OnClosing(WindowClosingEventArgs e)
{ {
if (_blCloseByUser)
{
return;
}
Logging.SaveLog("OnClosing -> " + e.CloseReason.ToString()); Logging.SaveLog("OnClosing -> " + e.CloseReason.ToString());
switch (e.CloseReason) switch (e.CloseReason)
@ -374,6 +380,8 @@ namespace v2rayN.Desktop.Views
{ {
return; return;
} }
_blCloseByUser = true;
StorageUI(); StorageUI();
await ViewModel?.MyAppExitAsync(false); await ViewModel?.MyAppExitAsync(false);