From 1af6c31dc02c80da3d0ca08df925a9b71cf03eb7 Mon Sep 17 00:00:00 2001
From: jduncanator <1518948+jduncanator@users.noreply.github.com>
Date: Mon, 21 Jan 2019 13:04:52 +1100
Subject: [PATCH] Resolve build merge conflict (#559)
---
Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs b/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs
index 18f41910ba..d5ea3bbfa1 100644
--- a/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs
+++ b/Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs
@@ -16,9 +16,8 @@ namespace Ryujinx.HLE.Exceptions
[Serializable]
internal class ServiceNotImplementedException : Exception
{
- public KSession Session { get; }
- public IpcMessage Request { get; }
public ServiceCtx Context { get; }
+ public IpcMessage Request { get; }
public ServiceNotImplementedException(ServiceCtx context)
: this(context, "The service call is not implemented.")
@@ -28,7 +27,6 @@ namespace Ryujinx.HLE.Exceptions
: base(message)
{
Context = context;
- Session = context.Session;
Request = context.Request;
}
@@ -36,7 +34,6 @@ namespace Ryujinx.HLE.Exceptions
: base(message, inner)
{
Context = context;
- Session = context.Session;
Request = context.Request;
}
@@ -74,7 +71,7 @@ namespace Ryujinx.HLE.Exceptions
if (ipcMethod != null)
{
- sb.AppendLine($"Service Command: {Session.ServiceName} {ipcService.GetType().Name}: {ipcCommandId} ({ipcMethod.Method.Name})");
+ sb.AppendLine($"Service Command: {ipcService.GetType().FullName}: {ipcCommandId} ({ipcMethod.Method.Name})");
sb.AppendLine();
}
}