mirror of
https://github.com/2dust/v2rayN.git
synced 2026-05-02 20:35:50 +00:00
Compare commits
No commits in common. "214a09bc48537c62d971d97c785de326abc1b5f1" and "0f4031f4451df388634ac9d856acae37cc500f2f" have entirely different histories.
214a09bc48
...
0f4031f445
3 changed files with 17 additions and 7 deletions
|
|
@ -1,7 +1,7 @@
|
||||||
<Project>
|
<Project>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>7.19.4</Version>
|
<Version>7.19.3</Version>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
|
|
|
||||||
|
|
@ -188,9 +188,14 @@ public class ProfilesSelectViewModel : MyReactiveObject
|
||||||
{
|
{
|
||||||
SubItems.Add(item);
|
SubItems.Add(item);
|
||||||
}
|
}
|
||||||
SelectedSub = (_config.SubIndexId.IsNotEmpty()
|
if (_subIndexId != null && SubItems.FirstOrDefault(t => t.Id == _subIndexId) != null)
|
||||||
? SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId)
|
{
|
||||||
: null) ?? SubItems.LastOrDefault();
|
SelectedSub = SubItems.FirstOrDefault(t => t.Id == _subIndexId);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SelectedSub = SubItems.First();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
|
private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
|
||||||
|
|
|
||||||
|
|
@ -391,9 +391,14 @@ public class ProfilesViewModel : MyReactiveObject
|
||||||
{
|
{
|
||||||
SubItems.Add(item);
|
SubItems.Add(item);
|
||||||
}
|
}
|
||||||
SelectedSub = (_config.SubIndexId.IsNotEmpty()
|
if (_config.SubIndexId != null && SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId) != null)
|
||||||
? SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId)
|
{
|
||||||
: null) ?? SubItems.LastOrDefault();
|
SelectedSub = SubItems.FirstOrDefault(t => t.Id == _config.SubIndexId);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
SelectedSub = SubItems.First();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
|
private async Task<List<ProfileItemModel>?> GetProfileItemsEx(string subid, string filter)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue