mirror of
https://github.com/sp-tarkov/launcher.git
synced 2025-02-13 03:30:43 -05:00
Merge branch 'master' into 3.8.0
This commit is contained in:
commit
e858b929b6
@ -11,6 +11,7 @@ using Splat;
|
|||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Reactive;
|
using System.Reactive;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
|
using Avalonia.Threading;
|
||||||
|
|
||||||
namespace Aki.Launcher.ViewModels
|
namespace Aki.Launcher.ViewModels
|
||||||
{
|
{
|
||||||
@ -110,13 +111,12 @@ namespace Aki.Launcher.ViewModels
|
|||||||
|
|
||||||
//handle auto-login
|
//handle auto-login
|
||||||
if (LauncherSettingsProvider.Instance.UseAutoLogin && LauncherSettingsProvider.Instance.Server.AutoLoginCreds != null && !NoAutoLogin)
|
if (LauncherSettingsProvider.Instance.UseAutoLogin && LauncherSettingsProvider.Instance.Server.AutoLoginCreds != null && !NoAutoLogin)
|
||||||
{
|
|
||||||
Task.Run(() =>
|
|
||||||
{
|
{
|
||||||
Login = LauncherSettingsProvider.Instance.Server.AutoLoginCreds;
|
Login = LauncherSettingsProvider.Instance.Server.AutoLoginCreds;
|
||||||
|
Dispatcher.UIThread.InvokeAsync(() =>
|
||||||
|
{
|
||||||
LoginCommand.Execute();
|
LoginCommand.Execute();
|
||||||
});
|
});
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user