diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs index 0166d894..e407ab33 100644 --- a/v2rayN/v2rayN/Mode/Config.cs +++ b/v2rayN/v2rayN/Mode/Config.cs @@ -143,8 +143,6 @@ public int trayMenuServersLimit { get; set; } = 20; - public bool autoHideStartup { get; set; } - #endregion #region other entities diff --git a/v2rayN/v2rayN/Mode/ConfigItems.cs b/v2rayN/v2rayN/Mode/ConfigItems.cs index f2dfe157..a6f1af79 100644 --- a/v2rayN/v2rayN/Mode/ConfigItems.cs +++ b/v2rayN/v2rayN/Mode/ConfigItems.cs @@ -65,6 +65,7 @@ namespace v2rayN.Mode public string currentFontFamily { get; set; } public bool enableDragDropSort { get; set; } public bool doubleClick2Activate { get; set; } + public bool autoHideStartup { get; set; } = true; public Dictionary mainLvColWidth { get; set; } } diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs index 0d9d2b78..f8dd66f6 100644 --- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs @@ -212,6 +212,10 @@ namespace v2rayN.ViewModels SelectedMoveToGroup = new(); SelectedRouting = new(); SelectedServer = new(); + if (_config.tunModeItem.enableTun && Utils.IsAdministrator()) + { + EnableTun = true; + } //RefreshServers(); InitSubscriptionView(); @@ -255,7 +259,7 @@ namespace v2rayN.ViewModels x => x.EnableTun, y => y == true) .Subscribe(c => DoEnableTun(c)); - + BindingUI(); RestoreUI(); AutoHideStartup(); @@ -1679,7 +1683,7 @@ namespace v2rayN.ViewModels private void AutoHideStartup() { - if (_config.autoHideStartup) + if (_config.uiItem.autoHideStartup) { Observable.Range(1, 1) .Delay(TimeSpan.FromSeconds(1)) diff --git a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs index 23cdeeb6..c4489919 100644 --- a/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/OptionSettingViewModel.cs @@ -141,7 +141,7 @@ namespace v2rayN.ViewModels IgnoreGeoUpdateCore = _config.ignoreGeoUpdateCore; EnableAutoAdjustMainLvColWidth = _config.uiItem.enableAutoAdjustMainLvColWidth; EnableSecurityProtocolTls13 = _config.enableSecurityProtocolTls13; - AutoHideStartup = _config.autoHideStartup; + AutoHideStartup = _config.uiItem.autoHideStartup; EnableCheckPreReleaseUpdate = _config.checkPreReleaseUpdate; EnableDragDropSort = _config.uiItem.enableDragDropSort; DoubleClick2Activate = _config.uiItem.doubleClick2Activate; @@ -309,7 +309,7 @@ namespace v2rayN.ViewModels _config.ignoreGeoUpdateCore = IgnoreGeoUpdateCore; _config.uiItem.enableAutoAdjustMainLvColWidth = EnableAutoAdjustMainLvColWidth; _config.enableSecurityProtocolTls13 = EnableSecurityProtocolTls13; - _config.autoHideStartup = AutoHideStartup; + _config.uiItem.autoHideStartup = AutoHideStartup; _config.autoUpdateInterval = autoUpdateInterval; _config.autoUpdateSubInterval = autoUpdateSubInterval; _config.checkPreReleaseUpdate = EnableCheckPreReleaseUpdate;