github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

bug fixes

pull/3301/head
2dust 2023-02-15 20:37:51 +08:00
parent c3e00ba31b
commit ca334104d7
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v2rayN/v2rayN/Tool/Utils.cs
View File

@ -72,6 +72,10 @@ namespace v2rayN
try
{
if (!File.Exists(res))
{
return result;
}
using (StreamReader reader = new StreamReader(res))
{
result = reader.ReadToEnd();

12
v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
View File

@ -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);
}