0
0
mirror of https://github.com/sp-tarkov/launcher.git synced 2025-02-12 17:10:44 -05:00

Merge branch 'master' into 3.8.0

This commit is contained in:
Dev 2023-11-17 10:55:38 +00:00
commit e858b929b6

View File

@ -11,6 +11,7 @@ using Splat;
using System.Collections.ObjectModel;
using System.Reactive;
using System.Threading.Tasks;
using Avalonia.Threading;
namespace Aki.Launcher.ViewModels
{
@ -111,12 +112,11 @@ namespace Aki.Launcher.ViewModels
//handle auto-login
if (LauncherSettingsProvider.Instance.UseAutoLogin && LauncherSettingsProvider.Instance.Server.AutoLoginCreds != null && !NoAutoLogin)
{
Task.Run(() =>
Login = LauncherSettingsProvider.Instance.Server.AutoLoginCreds;
Dispatcher.UIThread.InvokeAsync(() =>
{
Login = LauncherSettingsProvider.Instance.Server.AutoLoginCreds;
LoginCommand.Execute();
});
return;
}