Alex-Devera/v2rayN
1
0
Fork 0
mirror of https://github.com/2dust/v2rayN.git synced 2025-05-01 12:48:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix

Browse source
This commit is contained in:
2dust 2024-09-07 19:04:19 +08:00
parent bb90671979
commit 8361b4e4a0
5 changed files with 7 additions and 7 deletions

1
v2rayN/ServiceLib/Handler/WebDavHandler.cs
View file

@ -100,6 +100,7 @@ namespace ServiceLib.Handler
} }
else else
{ {
SaveLog(result.Description);
return false; return false;
} }
} }

2
v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs
View file

@ -28,7 +28,7 @@ namespace v2rayN.Desktop.Views
switch (action) switch (action)
{ {
case EViewAction.DispatcherCheckUpdate: case EViewAction.DispatcherCheckUpdate:
if (obj is null) return false; if (obj is null) return false;
Dispatcher.UIThread.Post(() => Dispatcher.UIThread.Post(() =>
ViewModel?.UpdateViewResult((CheckUpdateItem)obj), ViewModel?.UpdateViewResult((CheckUpdateItem)obj),
DispatcherPriority.Default); DispatcherPriority.Default);

2
v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
View file

@ -21,7 +21,7 @@ namespace v2rayN.Views
this.WhenActivated(disposables => this.WhenActivated(disposables =>
{ {
this.Bind(ViewModel, vm => vm.OperationMsg, v => v.txtMsg.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.OperationMsg, v => v.txtMsg.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.url, v => v.txtWebDavUrl.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SelectedSource.url, v => v.txtWebDavUrl.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.userName, v => v.txtWebDavUserName.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SelectedSource.userName, v => v.txtWebDavUserName.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.password, v => v.txtWebDavPassword.Text).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SelectedSource.password, v => v.txtWebDavPassword.Text).DisposeWith(disposables);

8
v2rayN/v2rayN/Views/CheckUpdateView.xaml
View file

@ -21,18 +21,18 @@
DockPanel.Dock="Bottom" DockPanel.Dock="Bottom"
Orientation="Horizontal"> Orientation="Horizontal">
<TextBlock <TextBlock
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
VerticalAlignment="Center" VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}" Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" /> Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
<ToggleButton <ToggleButton
x:Name="togEnableCheckPreReleaseUpdate" x:Name="togEnableCheckPreReleaseUpdate"
Margin="{StaticResource SettingItemMargin}" Margin="{StaticResource SettingItemMargin}"
HorizontalAlignment="Left" /> HorizontalAlignment="Left" />
<Button <Button
x:Name="btnCheckUpdate" x:Name="btnCheckUpdate"
Width="100" Width="100"
Margin="8" Margin="8"
Content="{x:Static resx:ResUI.menuCheckUpdate}" Content="{x:Static resx:ResUI.menuCheckUpdate}"
@ -40,7 +40,7 @@
IsDefault="True" IsDefault="True"
Style="{StaticResource MaterialDesignFlatButton}" /> Style="{StaticResource MaterialDesignFlatButton}" />
<Button <Button
Width="100" Width="100"
Margin="8" Margin="8"
HorizontalAlignment="Right" HorizontalAlignment="Right"

1
v2rayN/v2rayN/Views/ProfilesView.xaml.cs
View file

@ -1,5 +1,4 @@
using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf;
using Microsoft.Win32;
using ReactiveUI; using ReactiveUI;
using Splat; using Splat;
using System.Reactive.Disposables; using System.Reactive.Disposables;