Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-04-20 06:02:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug fix for IsAdministrator

Browse source 
This reverts commit 7618f9f7d4.
This commit is contained in:
2dust 2024-10-13 20:15:43 +08:00
parent e530789739
commit 4eb443e547
4 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
v2rayN/ServiceLib/Handler/AppHandler.cs
View file

@ -2,11 +2,14 @@
{ {
public sealed class AppHandler public sealed class AppHandler
{ {
#region Property
private static readonly Lazy<AppHandler> _instance = new(() => new()); private static readonly Lazy<AppHandler> _instance = new(() => new());
private Config _config; private Config _config;
private int? _statePort; private int? _statePort;
private int? _statePort2; private int? _statePort2;
private Job? _processJob; private Job? _processJob;
private bool? _isAdministrator;
public static AppHandler Instance => _instance.Value; public static AppHandler Instance => _instance.Value;
public Config Config => _config; public Config Config => _config;
@ -28,6 +31,17 @@
} }
} }
public bool IsAdministrator
{
get
{
_isAdministrator ??= Utils.IsAdministrator();
return _isAdministrator.Value;
}
}
#endregion Property
#region Init #region Init
public AppHandler() public AppHandler()

7
v2rayN/ServiceLib/ViewModels/StatusBarViewModel.cs
View file

@ -10,8 +10,6 @@ namespace ServiceLib.ViewModels
{ {
public class StatusBarViewModel : MyReactiveObject public class StatusBarViewModel : MyReactiveObject
{ {
private bool _isAdministrator { get; set; }
#region ObservableCollection #region ObservableCollection
private IObservableCollection<RoutingItem> _routingItems = new ObservableCollectionExtended<RoutingItem>(); private IObservableCollection<RoutingItem> _routingItems = new ObservableCollectionExtended<RoutingItem>();
@ -119,8 +117,7 @@ namespace ServiceLib.ViewModels
SelectedRouting = new(); SelectedRouting = new();
SelectedServer = new(); SelectedServer = new();
_isAdministrator = Utils.IsAdministrator(); if (_config.tunModeItem.enableTun && AppHandler.Instance.IsAdministrator)
if (_config.tunModeItem.enableTun && _isAdministrator)
{ {
EnableTun = true; EnableTun = true;
} }
@ -414,7 +411,7 @@ namespace ServiceLib.ViewModels
{ {
_config.tunModeItem.enableTun = EnableTun; _config.tunModeItem.enableTun = EnableTun;
// When running as a non-administrator, reboot to administrator mode // When running as a non-administrator, reboot to administrator mode
if (EnableTun && !_isAdministrator) if (EnableTun && !AppHandler.Instance.IsAdministrator)
{ {
_config.tunModeItem.enableTun = false; _config.tunModeItem.enableTun = false;
Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin(); Locator.Current.GetService<MainWindowViewModel>()?.RebootAsAdmin();

2
v2rayN/v2rayN.Desktop/Views/MainWindow.axaml.cs
View file

@ -103,7 +103,7 @@ namespace v2rayN.Desktop.Views
} }
}); });
this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}"; this.Title = $"{Utils.GetVersion()} - {(AppHandler.Instance.IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
if (Utils.IsWindows()) if (Utils.IsWindows())
{ {
menuGlobalHotkeySetting.IsVisible = false; menuGlobalHotkeySetting.IsVisible = false;

2
v2rayN/v2rayN/Views/MainWindow.xaml.cs
View file

@ -122,7 +122,7 @@ namespace v2rayN.Views
} }
}); });
this.Title = $"{Utils.GetVersion()} - {(Utils.IsAdministrator() ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}"; this.Title = $"{Utils.GetVersion()} - {(AppHandler.Instance.IsAdministrator ? ResUI.RunAsAdmin : ResUI.NotRunAsAdmin)}";
if (!_config.guiItem.enableHWA) if (!_config.guiItem.enableHWA)
{ {