From 087198079dccff9c8f077a4171515c0a81bf8f69 Mon Sep 17 00:00:00 2001 From: emmaus Date: Mon, 13 Aug 2018 21:38:26 +0000 Subject: [PATCH] use default user --- Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs | 2 +- Ryujinx.HLE/Settings/SystemSettings.cs | 6 ++---- Ryujinx.HLE/Switch.cs | 6 ++++++ Ryujinx/Ui/Program.cs | 4 ---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs b/Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs index c38e085c2c..0639b09c2a 100644 --- a/Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs +++ b/Ryujinx.HLE/OsHle/Services/Acc/IProfile.cs @@ -39,7 +39,7 @@ namespace Ryujinx.HLE.OsHle.Services.Acc public long GetBase(ServiceCtx Context) { - ProfileBase ProfileBase = new ProfileBase(Context.Ns.Settings.ActiveUser); + ProfileBase ProfileBase = new ProfileBase(Context.Ns.Settings.User); Context.ResponseData.Write(ProfileBase.UserId.ToBytes()); Context.ResponseData.Write(ProfileBase.Timestamp); diff --git a/Ryujinx.HLE/Settings/SystemSettings.cs b/Ryujinx.HLE/Settings/SystemSettings.cs index 9c8acacfdb..fb94807e35 100644 --- a/Ryujinx.HLE/Settings/SystemSettings.cs +++ b/Ryujinx.HLE/Settings/SystemSettings.cs @@ -5,9 +5,7 @@ namespace Ryujinx.HLE.Settings { public class SystemSettings { - public Profile ActiveUser { get; set; } - public ColorSet ThemeColor { get; set; } - public List UserProfiles { get; set; } - public int DefaultUserIndex { get; set; } + public Profile User { get; set; } + public ColorSet ThemeColor { get; set; } } } diff --git a/Ryujinx.HLE/Switch.cs b/Ryujinx.HLE/Switch.cs index a80ca86c19..f8e48372ee 100644 --- a/Ryujinx.HLE/Switch.cs +++ b/Ryujinx.HLE/Switch.cs @@ -67,6 +67,12 @@ namespace Ryujinx.HLE Os.FontSharedMem.MemoryMapped += Font.ShMemMap; Os.FontSharedMem.MemoryUnmapped += Font.ShMemUnmap; + + Settings.User = new Profile() + { + Username = "Ryujinx", + UserId = "00000000000000000000000000000000" + }; } public void LoadCart(string ExeFsDir, string RomFsFile = null) diff --git a/Ryujinx/Ui/Program.cs b/Ryujinx/Ui/Program.cs index ba6d6b9090..879b9c20bf 100644 --- a/Ryujinx/Ui/Program.cs +++ b/Ryujinx/Ui/Program.cs @@ -22,10 +22,6 @@ namespace Ryujinx Config.Read(Ns.Log); - Ns.Settings.UserProfiles = Config.Users; - Ns.Settings.DefaultUserIndex = Config.DefaultUserIndex; - Ns.Settings.ActiveUser = Config.Users[Config.DefaultUserIndex]; - Ns.Log.Updated += ConsoleLog.PrintLog; if (args.Length == 1)