Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
2dust committed Sep 7, 2024
1 parent bb90671 commit 8361b4e
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
1 change: 1 addition & 0 deletions v2rayN/ServiceLib/Handler/WebDavHandler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ public async Task<bool> CheckConnection()
}
else
{
SaveLog(result.Description);
return false;
}
}
Expand Down
2 changes: 1 addition & 1 deletion v2rayN/v2rayN.Desktop/Views/CheckUpdateView.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
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);
Expand Down
2 changes: 1 addition & 1 deletion v2rayN/v2rayN/Views/BackupAndRestoreView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public BackupAndRestoreView()
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);
Expand Down
8 changes: 4 additions & 4 deletions v2rayN/v2rayN/Views/CheckUpdateView.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,26 +21,26 @@
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}"
IsCancel="True"
IsDefault="True"
Style="{StaticResource MaterialDesignFlatButton}" />

<Button
<Button
Width="100"
Margin="8"
HorizontalAlignment="Right"
Expand Down
1 change: 0 additions & 1 deletion v2rayN/v2rayN/Views/ProfilesView.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using MaterialDesignThemes.Wpf;
using Microsoft.Win32;
using ReactiveUI;
using Splat;
using System.Reactive.Disposables;
Expand Down

0 comments on commit 8361b4e

Please sign in to comment.