diff --git a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
index c6b28a55e..ce9e78967 100644
--- a/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
+++ b/src/ST.Client.Desktop.Avalonia/Application/UI/Views/Pages/ProxyScriptManagePage.axaml
@@ -31,20 +31,20 @@
VerticalAlignment="Center">
-
-
-
- ();
- thm.ForceNativeTitleBarToTheme(this);
+ AvaloniaLocator.Current.GetService().ForceNativeTitleBarToTheme(this);
}
}
diff --git a/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs b/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs
index e49ed9ef7..a6e9480d9 100644
--- a/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs
+++ b/src/ST.Client.Desktop/Services/Implementation/WindowServiceImpl.cs
@@ -43,13 +43,16 @@ namespace System.Application.Services.Implementation
mainWindow = new MainWindowViewModel();
MainWindow = mainWindow;
}
- taskbarWindow = new TaskBarWindowViewModel();
}
catch (Exception ex)
{
Log.Error("WindowService", ex, "Init WindowViewModel");
throw;
}
+ finally
+ {
+ taskbarWindow = new TaskBarWindowViewModel();
+ }
}
int? appidUnlockAchievement;
@@ -82,14 +85,14 @@ namespace System.Application.Services.Implementation
{
try
{
- if (!taskbarWindow.IsVisible)
- {
- taskbarWindow.Show(x, y);
- }
- else
- {
- taskbarWindow.SetPosition(x, y);
- }
+ //if (!taskbarWindow.IsVisible)
+ //{
+ taskbarWindow.Show(x, y);
+ //}
+ //else
+ //{
+ // taskbarWindow.SetPosition(x, y);
+ //}
}
catch (Exception ex)
{