From ca334104d77b52cdc71be5de445ecba85b4695a4 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 15 Feb 2023 20:37:51 +0800
Subject: [PATCH] bug fixes

---
 v2rayN/v2rayN/Tool/Utils.cs                     |  4 ++++
 v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs | 12 ++++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Tool/Utils.cs
index aded28e2..c4dbea64 100644
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Tool/Utils.cs
@@ -72,6 +72,10 @@ namespace v2rayN
 
             try
             {
+                if (!File.Exists(res))
+                {
+                    return result;
+                }
                 using (StreamReader reader = new StreamReader(res))
                 {
                     result = reader.ReadToEnd();
diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index b4556c80..c829e412 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -801,7 +801,14 @@ namespace v2rayN.ViewModels
             {
                 _subItems.Add(item);
             }
-            SelectedSub = _subItems[0];
+            if (_subId != null && _subItems.FirstOrDefault(t => t.id == _subId) != null)
+            {
+                SelectedSub = _subItems.FirstOrDefault(t => t.id == _subId);
+            }
+            else
+            {
+                SelectedSub = _subItems[0];
+            }
         }
 
         #endregion
@@ -834,7 +841,6 @@ namespace v2rayN.ViewModels
                 {
                     subid = _subId,
                     configType = eConfigType,
-                    displayLog = false
                 };
             }
             else
@@ -876,6 +882,7 @@ namespace v2rayN.ViewModels
             int ret = ConfigHandler.AddBatchServers(ref _config, clipboardData, _subId, false);
             if (ret > 0)
             {
+                InitSubscriptionView();
                 RefreshServers();
                 _noticeHandler?.Enqueue(string.Format(ResUI.SuccessfullyImportedServerViaClipboard, ret));
             }
@@ -900,6 +907,7 @@ namespace v2rayN.ViewModels
                 int ret = ConfigHandler.AddBatchServers(ref _config, result, _subId, false);
                 if (ret > 0)
                 {
+                    InitSubscriptionView();
                     RefreshServers();
                     _noticeHandler?.Enqueue(ResUI.SuccessfullyImportedServerViaScan);
                 }