pjandro/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2026-09-27 00:52:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Bug fix

Browse Source 
https://github.com/2dust/v2rayN/issues/5725
This commit is contained in:
2dust
2024-09-23 13:37:18 +08:00
parent 97347674e7
commit 054f0f2bc7
3 changed files with 20 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs
+15 -6
View File
@@ -14,6 +14,7 @@ namespace ServiceLib.ViewModels
#region private prop
private CoreHandler _coreHandler;
private bool _isAdministrator { get; set; }
#endregion private prop
@@ -139,17 +140,16 @@ namespace ServiceLib.ViewModels
[Reactive]
public int TabMainSelectedIndex { get; set; }
public bool IsAdministrator { get; set; }
#endregion UI
#region Init
public MainWindowViewModel(Func<EViewAction, object?, Task<bool>>? updateView)
public MainWindowViewModel(bool isAdministrator, Func<EViewAction, object?, Task<bool>>? updateView)
{
_config = LazyConfig.Instance.Config;
_noticeHandler = Locator.Current.GetService<NoticeHandler>();
_updateView = updateView;
_isAdministrator = isAdministrator;
MessageBus.Current.Listen<string>(Global.CommandRefreshProfiles).Subscribe(async x => await _updateView?.Invoke(EViewAction.DispatcherRefreshServersBiz, null));
@@ -158,6 +158,16 @@ namespace ServiceLib.ViewModels
Init();
_config.uiItem.showInTaskbar = true;
if (_config.tunModeItem.enableTun && _isAdministrator)
{
EnableTun = true;
}
else
{
_config.tunModeItem.enableTun = EnableTun = false;
}
#region WhenAnyValue && ReactiveCommand
this.WhenAnyValue(
@@ -319,8 +329,6 @@ namespace ServiceLib.ViewModels
#endregion WhenAnyValue && ReactiveCommand
AutoHideStartup();
_config.uiItem.showInTaskbar = true;
}
private void Init()
@@ -853,12 +861,13 @@ namespace ServiceLib.ViewModels
{
_config.tunModeItem.enableTun = EnableTun;
// When running as a non-administrator, reboot to administrator mode
if (EnableTun && !IsAdministrator)
if (EnableTun && !_isAdministrator)
{
_config.tunModeItem.enableTun = false;
RebootAsAdmin();
return;
}
ConfigHandler.SaveConfig(_config);
Reload();
}
}