1 files changed, 19 insertions, 9 deletions
diff --git a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
index 108cb56f..f3113e65 100644
--- a/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
+++ b/Ryujinx.HLE/HOS/Services/Settings/ISystemSettingsServer.cs
@@ -35,7 +35,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
 
             if (firmwareData != null)
             {
-                context.Memory.WriteBytes(replyPos, firmwareData);
+                context.Memory.Write((ulong)replyPos, firmwareData);
 
                 return ResultCode.Success;
             }
@@ -78,7 +78,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
 
                 writer.Write(Encoding.ASCII.GetBytes(build));
 
-                context.Memory.WriteBytes(replyPos, ms.ToArray());
+                context.Memory.Write((ulong)replyPos, ms.ToArray());
             }
 
             return ResultCode.Success;
@@ -114,10 +114,15 @@ namespace Ryujinx.HLE.HOS.Services.Settings
             long namePos  = context.Request.PtrBuff[1].Position;
             long nameSize = context.Request.PtrBuff[1].Size;
 
-            byte[] Class = context.Memory.ReadBytes(classPos, classSize);
-            byte[] name  = context.Memory.ReadBytes(namePos, nameSize);
+            byte[] classBuffer = new byte[classSize];
 
-            string askedSetting = Encoding.ASCII.GetString(Class).Trim('\0') + "!" + Encoding.ASCII.GetString(name).Trim('\0');
+            context.Memory.Read((ulong)classPos, classBuffer);
+
+            byte[] nameBuffer = new byte[nameSize];
+
+            context.Memory.Read((ulong)namePos, nameBuffer);
+
+            string askedSetting = Encoding.ASCII.GetString(classBuffer).Trim('\0') + "!" + Encoding.ASCII.GetString(nameBuffer).Trim('\0');
 
             NxSettings.Settings.TryGetValue(askedSetting, out object nxSetting);
 
@@ -161,10 +166,15 @@ namespace Ryujinx.HLE.HOS.Services.Settings
             long replyPos  = context.Request.ReceiveBuff[0].Position;
             long replySize = context.Request.ReceiveBuff[0].Size;
 
-            byte[] Class = context.Memory.ReadBytes(classPos, classSize);
-            byte[] name  = context.Memory.ReadBytes(namePos, nameSize);
+            byte[] classBuffer = new byte[classSize];
+
+            context.Memory.Read((ulong)classPos, classBuffer);
+
+            byte[] nameBuffer = new byte[nameSize];
+
+            context.Memory.Read((ulong)namePos, nameBuffer);
 
-            string askedSetting = Encoding.ASCII.GetString(Class).Trim('\0') + "!" + Encoding.ASCII.GetString(name).Trim('\0');
+            string askedSetting = Encoding.ASCII.GetString(classBuffer).Trim('\0') + "!" + Encoding.ASCII.GetString(nameBuffer).Trim('\0');
 
             NxSettings.Settings.TryGetValue(askedSetting, out object nxSetting);
 
@@ -197,7 +207,7 @@ namespace Ryujinx.HLE.HOS.Services.Settings
                     throw new NotImplementedException(nxSetting.GetType().Name);
                 }
 
-                context.Memory.WriteBytes(replyPos, settingBuffer);
+                context.Memory.Write((ulong)replyPos, settingBuffer);
 
                 Logger.PrintDebug(LogClass.ServiceSet, $"{askedSetting} set value: {nxSetting} as {nxSetting.GetType()}");
             }