mirror of
https://github.com/2dust/v2rayN.git
synced 2025-11-29 03:02:53 +00:00
Compare commits
No commits in common. "6b87c09a96a6319f1bdd284b67134b2368507f73" and "ad74b1584d3814e3e51adc52c3b82ff39da64b91" have entirely different histories.
6b87c09a96
...
ad74b1584d
3 changed files with 4 additions and 9 deletions
|
|
@ -553,11 +553,6 @@ public class ProfilesViewModel : MyReactiveObject
|
||||||
|
|
||||||
private async Task RemoveDuplicateServer()
|
private async Task RemoveDuplicateServer()
|
||||||
{
|
{
|
||||||
if (await _updateView?.Invoke(EViewAction.ShowYesNo, null) == false)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var tuple = await ConfigHandler.DedupServerList(_config, _config.SubIndexId);
|
var tuple = await ConfigHandler.DedupServerList(_config, _config.SubIndexId);
|
||||||
if (tuple.Item1 > 0 || tuple.Item2 > 0)
|
if (tuple.Item1 > 0 || tuple.Item2 > 0)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -9,8 +9,8 @@
|
||||||
xmlns:view="using:v2rayN.Desktop.Views"
|
xmlns:view="using:v2rayN.Desktop.Views"
|
||||||
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
|
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
|
||||||
Title="v2rayN"
|
Title="v2rayN"
|
||||||
Width="1200"
|
Width="1000"
|
||||||
Height="800"
|
Height="600"
|
||||||
MinWidth="900"
|
MinWidth="900"
|
||||||
x:DataType="vms:MainWindowViewModel"
|
x:DataType="vms:MainWindowViewModel"
|
||||||
Icon="/Assets/NotifyIcon1.ico"
|
Icon="/Assets/NotifyIcon1.ico"
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,8 @@
|
||||||
xmlns:view="clr-namespace:v2rayN.Views"
|
xmlns:view="clr-namespace:v2rayN.Views"
|
||||||
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
|
xmlns:vms="clr-namespace:ServiceLib.ViewModels;assembly=ServiceLib"
|
||||||
Title="v2rayN"
|
Title="v2rayN"
|
||||||
Width="1200"
|
Width="900"
|
||||||
Height="800"
|
Height="700"
|
||||||
MinWidth="900"
|
MinWidth="900"
|
||||||
x:TypeArguments="vms:MainWindowViewModel"
|
x:TypeArguments="vms:MainWindowViewModel"
|
||||||
Icon="/Resources/v2rayN.ico"
|
Icon="/Resources/v2rayN.ico"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue