From 8361b4e4a0fb7dcefac6a06da33d3669bd583daa Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sat, 7 Sep 2024 19:04:19 +0800
Subject: [PATCH] Fix
---
v2rayN/ServiceLib/Handler/WebDavHandler.cs | 1 +
v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs | 2 +-
v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs | 2 +-
v2rayN/v2rayN/Views/CheckUpdateView.xaml | 8 ++++----
v2rayN/v2rayN/Views/ProfilesView.xaml.cs | 1 -
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/v2rayN/ServiceLib/Handler/WebDavHandler.cs b/v2rayN/ServiceLib/Handler/WebDavHandler.cs
index 526a7028..fd1d5e55 100644
--- a/v2rayN/ServiceLib/Handler/WebDavHandler.cs
+++ b/v2rayN/ServiceLib/Handler/WebDavHandler.cs
@@ -100,6 +100,7 @@ namespace ServiceLib.Handler
}
else
{
+ SaveLog(result.Description);
return false;
}
}
diff --git a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs
index ea1c0ddf..a11a72fa 100644
--- a/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs
+++ b/v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs
@@ -28,7 +28,7 @@ namespace v2rayN.Desktop.Views
switch (action)
{
case EViewAction.DispatcherCheckUpdate:
- if (obj is null) return false;
+ if (obj is null) return false;
Dispatcher.UIThread.Post(() =>
ViewModel?.UpdateViewResult((CheckUpdateItem)obj),
DispatcherPriority.Default);
diff --git a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
index 029048b8..5bc930dd 100644
--- a/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
+++ b/v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
@@ -21,7 +21,7 @@ namespace v2rayN.Views
this.WhenActivated(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.userName, v => v.txtWebDavUserName.Text).DisposeWith(disposables);
this.Bind(ViewModel, vm => vm.SelectedSource.password, v => v.txtWebDavPassword.Text).DisposeWith(disposables);
diff --git a/v2rayN/v2rayN/Views/CheckUpdateView.xaml b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
index fcbe2552..0f101a0d 100644
--- a/v2rayN/v2rayN/Views/CheckUpdateView.xaml
+++ b/v2rayN/v2rayN/Views/CheckUpdateView.xaml
@@ -21,18 +21,18 @@
DockPanel.Dock="Bottom"
Orientation="Horizontal">
- <TextBlock
+ <TextBlock
Margin="{StaticResource SettingItemMargin}"
VerticalAlignment="Center"
Style="{StaticResource ToolbarTextBlock}"
Text="{x:Static resx:ResUI.TbSettingsEnableCheckPreReleaseUpdate}" />
<ToggleButton
- x:Name="togEnableCheckPreReleaseUpdate"
+ x:Name="togEnableCheckPreReleaseUpdate"
Margin="{StaticResource SettingItemMargin}"
HorizontalAlignment="Left" />
<Button
- x:Name="btnCheckUpdate"
+ x:Name="btnCheckUpdate"
Width="100"
Margin="8"
Content="{x:Static resx:ResUI.menuCheckUpdate}"
@@ -40,7 +40,7 @@
IsDefault="True"
Style="{StaticResource MaterialDesignFlatButton}" />
- <Button
+ <Button
Width="100"
Margin="8"
HorizontalAlignment="Right"
diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
index b6d0ee76..625dadf6 100644
--- a/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
+++ b/v2rayN/v2rayN/Views/ProfilesView.xaml.cs
@@ -1,5 +1,4 @@
using MaterialDesignThemes.Wpf;
-using Microsoft.Win32;
using ReactiveUI;
using Splat;
using System.Reactive.Disposables;