diff --git a/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj b/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
index 713339f02..b2081e8c8 100644
--- a/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
+++ b/src/ST.Client.Desktop.Avalonia/ST.Client.Desktop.Avalonia.csproj
@@ -44,17 +44,17 @@
-
-
-
-
+
+
+
+
-
+
diff --git a/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs b/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs
index 17b3e45d5..d88b367d1 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/ProxyService.cs
@@ -147,9 +147,11 @@ namespace System.Application.Services
if (!ProxySettings.EnableWindowsProxy.Value)
{
- if (httpProxyService.PortInUse(443))
+ var p = DI.Get().GetProcessByPortOccupy(443, true);
+
+ if (p != null)
{
- Toast.Show(AppResources.CommunityFix_StartProxyFaild443);
+ Toast.Show(string.Format(AppResources.CommunityFix_StartProxyFaild443, p.ProcessName));
return;
}
}
diff --git a/src/ST.Client.Desktop/Services/Mvvm/UserService.cs b/src/ST.Client.Desktop/Services/Mvvm/UserService.cs
index f73199aa3..8dc2005b6 100644
--- a/src/ST.Client.Desktop/Services/Mvvm/UserService.cs
+++ b/src/ST.Client.Desktop/Services/Mvvm/UserService.cs
@@ -102,6 +102,8 @@ namespace System.Application.Services
userManager.OnSignOut += () =>
{
User = null;
+ CurrentSteamUser = null;
+ AvaterPath = DefaultAvaterPath;
};
//ShowWindow = ReactiveCommand.Create(n => ShowWindowF(n));
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
index 0c5ec42a9..91a982376 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.Designer.cs
@@ -657,7 +657,7 @@ namespace System.Application.UI.Resx {
}
///
- /// 查找类似 加速服务启动失败,443端口被占用。请检查您的443端口或者尝试使用Windows代理模式。 的本地化字符串。
+ /// 查找类似 加速服务启动失败,443端口被{0}占用。请检查您的443端口或者尝试使用Windows代理模式。 的本地化字符串。
///
public static string CommunityFix_StartProxyFaild443 {
get {
diff --git a/src/ST.Client.Desktop/UI/Resx/AppResources.resx b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
index 9017f74bf..009cf2050 100644
--- a/src/ST.Client.Desktop/UI/Resx/AppResources.resx
+++ b/src/ST.Client.Desktop/UI/Resx/AppResources.resx
@@ -319,7 +319,7 @@
启动加速服务失败,证书安装失败。
- 加速服务启动失败,443端口被占用。请检查您的443端口或者尝试使用Windows代理模式。
+ 加速服务启动失败,443端口被{0}占用。请检查您的443端口或者尝试使用Windows代理模式。
加速已启动成功