manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2024-11-15 01:25:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resolve build merge conflict (#559)

Browse source
This commit is contained in:
jduncanator 2019-01-21 13:04:52 +11:00 committed by gdkchan
parent 22bacc6188
commit 1af6c31dc0
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Ryujinx.HLE/Exceptions/ServiceNotImplementedException.cs
View file

@ -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();
}
}