From e3c2a4b8da124bf887e35552c8a64f6a552f61f6 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Fri, 28 Jun 2024 10:41:17 +0800
Subject: [PATCH] Bug fix

---
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index 57f522ef..805d0a29 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -261,9 +261,16 @@ namespace v2rayN.ViewModels
             SelectedMoveToGroup = new();
             SelectedRouting = new();
             SelectedServer = new();
-            if (_config.tunModeItem.enableTun && Utils.IsAdministrator())
+            if (_config.tunModeItem.enableTun)
             {
-                EnableTun = true;
+                if (Utils.IsAdministrator())
+                {
+                    EnableTun = true;
+                }
+                else
+                {
+                    _config.tunModeItem.enableTun = EnableTun = false;
+                }
             }
             _subId = _config.subIndexId;
 
@@ -1502,7 +1509,7 @@ namespace v2rayN.ViewModels
                 Application.Current?.Dispatcher.Invoke((Action)(() =>
                 {
                     BlReloadEnabled = true;
-                })); 
+                }));
             });
         }
 
@@ -1515,7 +1522,7 @@ namespace v2rayN.ViewModels
                 //ConfigHandler.SaveConfig(_config, false);
 
                 ChangeSystemProxyStatus(_config.sysProxyType, false);
-            }); 
+            });
         }
 
         private void CloseCore()
@@ -1547,7 +1554,7 @@ namespace v2rayN.ViewModels
         private void ChangeSystemProxyStatus(ESysProxyType type, bool blChange)
         {
             SysProxyHandle.UpdateSysProxy(_config, _config.tunModeItem.enableTun ? true : false);
-            _noticeHandler?.SendMessage(ResUI.TipChangeSystemProxy + _config.sysProxyType.ToString(), true);
+            _noticeHandler?.SendMessage($"{ResUI.TipChangeSystemProxy} - {_config.sysProxyType.ToString()}", true);
 
             Application.Current?.Dispatcher.Invoke((Action)(() =>
             {