Accurate Service Names (ryubing/ryujinx!296)

See merge request ryubing/ryujinx!296

.github/workflows/canary.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
@@ -162,7 +162,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
@@ -215,7 +215,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH

.github/workflows/release.yml

@@ -44,7 +44,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
@@ -161,7 +161,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH
@@ -217,7 +217,7 @@ jobs:
       - name: Install gli
         run: |
           mkdir -p $HOME/.bin
-          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64'
+          gh release download -R GreemDev/GLI -O gli -p 'gli-linux-x64' 2.0.30
           chmod +x gli
           mv gli $HOME/.bin/
           echo "$HOME/.bin" >> $GITHUB_PATH

Directory.Packages.props

@@ -3,13 +3,13 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Avalonia" Version="11.3.6" />
-    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.6" />
-    <PackageVersion Include="Avalonia.Desktop" Version="11.3.6" />
-    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.6" />
-    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.6" />
-    <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.6.2" />
-    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.6.2" />
+    <PackageVersion Include="Avalonia" Version="11.3.12" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="11.3.12" />
+    <PackageVersion Include="Avalonia.Desktop" Version="11.3.12" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="11.3.12" />
+    <PackageVersion Include="Avalonia.Markup.Xaml.Loader" Version="11.3.12" />
+    <PackageVersion Include="Svg.Controls.Avalonia" Version="11.3.9.4" />
+    <PackageVersion Include="Svg.Controls.Skia.Avalonia" Version="11.3.9.4" />
     <PackageVersion Include="Microsoft.Build.Framework" Version="17.11.4" />
     <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="17.12.6" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -22,7 +22,7 @@
     <PackageVersion Include="Concentus" Version="2.2.2" />
     <PackageVersion Include="DiscordRichPresence" Version="1.6.1.70" />
     <PackageVersion Include="DynamicData" Version="9.4.1" />
-    <PackageVersion Include="FluentAvaloniaUI.NoAnim" Version="2.4.0-build3" />
+    <PackageVersion Include="FluentAvaloniaUI" Version="2.5.0" />
     <PackageVersion Include="Humanizer" Version="2.14.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />

assets/Locales/Root.json

@@ -575,6 +575,31 @@
         "zh_TW": "停止模擬"
       }
     },
+    {
+      "ID": "MenuBarOptionsRestartEmulation",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Restart Emulation",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "Starta om emulering",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "MenuBarOptionsSettings",
       "Translations": {
@@ -11317,7 +11342,7 @@
         "pl_PL": "",
         "pt_BR": "",
         "ru_RU": "",
-        "sv_SE": "",
+        "sv_SE": "Spara",
         "th_TH": "",
         "tr_TR": "",
         "uk_UA": "",
@@ -24876,4 +24901,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx.Graphics.Vulkan/Auto.cs

@@ -1,4 +1,3 @@
-using Ryujinx.Common.Logging;
 using System;
 using System.Diagnostics;
 using System.Threading;
@@ -115,7 +114,7 @@ namespace Ryujinx.Graphics.Vulkan
                 cbs.AddDependant(this);
 
                 // We need to add a dependency on the command buffer to all objects this object
-                // references as well.
+                // references aswell.
                 if (_referencedObjs != null)
                 {
                     for (int i = 0; i < _referencedObjs.Length; i++)
@@ -177,8 +176,6 @@ namespace Ryujinx.Graphics.Vulkan
                 }
             }
 
-            // This can somehow become -1.
-            // Logger.Info?.PrintMsg(LogClass.Gpu, $"_referenceCount: {_referenceCount}");
             Debug.Assert(_referenceCount >= 0);
         }
 

src/Ryujinx.HLE/FileSystem/ContentManager.cs

@@ -488,6 +488,8 @@ namespace Ryujinx.HLE.FileSystem
                 if (keyPaths.Length is 0)
                     throw new FileNotFoundException($"Directory '{keysSource}' contained no '.keys' files.");
 
+                List<string> failedFiles = new();
+
                 foreach (string filePath in keyPaths)
                 {
                     try
@@ -497,17 +499,20 @@ namespace Ryujinx.HLE.FileSystem
                     catch (Exception e)
                     {
                         Logger.Error?.Print(LogClass.Application, e.Message);
+                        failedFiles.Add(Path.GetFileName(filePath));
                         continue;
                     }
 
                     string destPath = Path.Combine(installDirectory, Path.GetFileName(filePath));
 
-                    if (File.Exists(destPath))
-                        File.Delete(destPath);
-
                     File.Copy(filePath, destPath, true);
                 }
 
+                if (failedFiles.Count > 0)
+                {
+                    throw new InvalidOperationException($"Failed to install the following key files: {string.Join(", ", failedFiles)}");
+                }
+
                 return;
             }
 
@@ -518,8 +523,6 @@ namespace Ryujinx.HLE.FileSystem
 
             FileInfo info = new(keysSource);
 
-            using FileStream file = File.OpenRead(keysSource);
-
             if (info.Extension is not ".keys")
                 throw new InvalidFirmwarePackageException("Input file extension is not .keys");
 
@@ -534,10 +537,6 @@ namespace Ryujinx.HLE.FileSystem
 
             string dest = Path.Combine(installDirectory, info.Name);
 
-            if (File.Exists(dest))
-                File.Delete(dest);
-
-            // overwrite: true seems to not work on its own? https://github.com/Ryubing/Issues/issues/189
             File.Copy(keysSource, dest, true);
         }
 

src/Ryujinx.HLE/HOS/Horizon.cs

@@ -246,21 +246,21 @@ namespace Ryujinx.HLE.HOS
         public void InitializeServices()
         {
             SmRegistry = new SmRegistry();
-            SmServer = new ServerBase(KernelContext, "SmServer", () => new IUserInterface(KernelContext, SmRegistry));
+            SmServer = new ServerBase(KernelContext, "Sm", () => new IUserInterface(KernelContext, SmRegistry));
 
             // Wait until SM server thread is done with initialization,
             // only then doing connections to SM is safe.
             SmServer.InitDone.WaitOne();
 
-            BsdServer = new ServerBase(KernelContext, "BsdServer");
-            FsServer = new ServerBase(KernelContext, "FsServer");
-            HidServer = new ServerBase(KernelContext, "HidServer");
-            NvDrvServer = new ServerBase(KernelContext, "NvservicesServer");
-            TimeServer = new ServerBase(KernelContext, "TimeServer");
-            ViServer = new ServerBase(KernelContext, "ViServerU");
-            ViServerM = new ServerBase(KernelContext, "ViServerM");
-            ViServerS = new ServerBase(KernelContext, "ViServerS");
-            LdnServer = new ServerBase(KernelContext, "LdnServer");
+            BsdServer = new ServerBase(KernelContext, "Bsd");
+            FsServer = new ServerBase(KernelContext, "Fs");
+            HidServer = new ServerBase(KernelContext, "Hid");
+            NvDrvServer = new ServerBase(KernelContext, "Nv");
+            TimeServer = new ServerBase(KernelContext, "Time");
+            ViServer = new ServerBase(KernelContext, "Vi:u");
+            ViServerM = new ServerBase(KernelContext, "Vi:m");
+            ViServerS = new ServerBase(KernelContext, "Vi:s");
+            LdnServer = new ServerBase(KernelContext, "Ldn");
 
             StartNewServices();
         }
@@ -286,7 +286,7 @@ namespace Ryujinx.HLE.HOS
                     ProcessCreationFlags.Is64Bit |
                     ProcessCreationFlags.PoolPartitionSystem;
 
-                ProcessCreationInfo creationInfo = new("Service", 1, 0, 0x8000000, 1, Flags, 0, 0);
+                ProcessCreationInfo creationInfo = new(service.Name, 1, 0, 0x8000000, 1, Flags, 0, 0);
 
                 uint[] defaultCapabilities =
                 [

src/Ryujinx.HLE/HOS/Services/Hid/HidDevices/NpadDevices.cs

@@ -56,6 +56,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             _activeCount = 0;
 
             JoyHold = NpadJoyHoldType.Vertical;
+            SixAxisActive = false;
         }
 
         internal ref KEvent GetStyleSetUpdateEvent(PlayerIndex player)
@@ -580,6 +581,29 @@ namespace Ryujinx.HLE.HOS.Services.Hid
 
             return needUpdateRight;
         }
+        
+        public bool isAtRest(int playerNumber)
+        {
+            ref NpadInternalState currentNpad = ref _device.Hid.SharedMemory.Npads[playerNumber].InternalState;
+
+            if (currentNpad.StyleSet == NpadStyleTag.None)
+            {
+                return true; // it will always be at rest because it cannot move.
+            }
+            
+            ref SixAxisSensorState storage = ref GetSixAxisSensorLifo(ref currentNpad, false).GetCurrentEntryRef();
+                
+            float acceleration = Math.Abs(storage.Acceleration.X)
+                                 + Math.Abs(storage.Acceleration.Y)
+                                 + Math.Abs(storage.Acceleration.Z);
+
+            float angularVelocity = Math.Abs(storage.AngularVelocity.X)
+                                    + Math.Abs(storage.AngularVelocity.Y)
+                                    + Math.Abs(storage.AngularVelocity.Z);
+
+            // TODO: check against config deadzone and add sensitivity setting
+            return ((acceleration <= 1.0F) && (angularVelocity <= 1.0F));
+        }
 
         private void UpdateDisconnectedInputSixAxis(PlayerIndex index)
         {

src/Ryujinx.HLE/HOS/Services/Hid/IHidServer.cs

@@ -602,19 +602,33 @@ namespace Ryujinx.HLE.HOS.Services.Hid
         }
 
         [CommandCmif(82)]
-        // IsSixAxisSensorAtRest(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> bool IsAsRest
+        // IsSixAxisSensorAtRest(nn::hid::SixAxisSensorHandle, nn::applet::AppletResourceUserId) -> bool IsAtRest
         public ResultCode IsSixAxisSensorAtRest(ServiceCtx context)
         {
             int sixAxisSensorHandle = context.RequestData.ReadInt32();
+            
+            // 4 byte struct w/ 4-byte alignment
+            
+            // uint typeValue = (uint) sixAxisSensorHandle;                 // 0x0 	0x4 	TypeValue
+            // uint npadStyleIndex = (uint) sixAxisSensorHandle & 0xff;     // 0x0 	0x1 	NpadStyleIndex
+            int playerNumber = (sixAxisSensorHandle << 8) & 0xff;           // 0x1 	0x1 	PlayerNumber
+            // uint deviceIdx= ((uint) sixAxisSensorHandle << 16) & 0xff;   // 0x2 	0x1 	DeviceIdx 
+            // uint unknown = ((uint) sixAxisSensorHandle << 24) & 0xff;
+            
+            // 32bit sign extension padding -> if = 0, + offset, else - offset
+            
+            // npadStyleIndex = ((npadStyleIndex & 0x8000) == 0) ? npadStyleIndex | 0xFFFF0000 : npadStyleIndex & 0xFFFF0000;
+            // playerNumber = ((playerNumber & 0x8000) == 0) ? playerNumber | 0xFFFF0000 : playerNumber & 0xFFFF0000;
+            // deviceIdx = ((deviceIdx & 0x8000) == 0) ? deviceIdx | 0xFFFF0000 : deviceIdx & 0xFFFF0000;
+            // unknown = ((unknown & 0x8000) == 0) ? unknown | 0xFFFF0000 : unknown & 0xFFFF0000;
+            
             context.RequestData.BaseStream.Position += 4; // Padding
             long appletResourceUserId = context.RequestData.ReadInt64();
-
-            bool isAtRest = true;
-
-            context.ResponseData.Write(isAtRest);
-
-            Logger.Stub?.PrintStub(LogClass.ServiceHid, new { appletResourceUserId, sixAxisSensorHandle, isAtRest });
-
+            
+            // TODO: link to context.Device.Hid.Npads.SixAxisActive when properly implemented
+            // We currently do not support stopping or starting SixAxisTracking.
+            
+            context.ResponseData.Write(context.Device.Hid.Npads.isAtRest(playerNumber));
             return ResultCode.Success;
         }
 
@@ -629,7 +643,7 @@ namespace Ryujinx.HLE.HOS.Services.Hid
             context.ResponseData.Write(_isFirmwareUpdateAvailableForSixAxisSensor);
 
             Logger.Stub?.PrintStub(LogClass.ServiceHid, new { appletResourceUserId, sixAxisSensorHandle, _isFirmwareUpdateAvailableForSixAxisSensor });
-
+            
             return ResultCode.Success;
         }
 

src/Ryujinx.HLE/HOS/Services/ServerBase.cs

@@ -79,9 +79,15 @@ namespace Ryujinx.HLE.HOS.Services
                 ProcessCreationFlags.Is64Bit |
                 ProcessCreationFlags.PoolPartitionSystem;
 
-            ProcessCreationInfo creationInfo = new("Service", 1, 0, 0x8000000, 1, Flags, 0, 0);
+            ProcessCreationInfo creationInfo = new(Name, 1, 0, 0x8000000, 1, Flags, 0, 0);
 
-            KernelStatic.StartInitialProcess(context, creationInfo, DefaultCapabilities, 44, Main);
+            KernelStatic.StartInitialProcess(context, creationInfo, DefaultCapabilities, 44, () =>
+            {
+                var currentThread = KernelStatic.GetCurrentThread();
+                currentThread.HostThread.Name = $"{{{Name}}}";
+
+                Main();
+            });
         }
 
         private void AddPort(int serverPortHandle, Func<IpcService> objectFactory)

src/Ryujinx.HLE/HOS/Services/Sm/IUserInterface.cs

@@ -17,13 +17,12 @@ namespace Ryujinx.HLE.HOS.Services.Sm
         private static readonly Dictionary<string, Type> _services;
 
         private readonly SmRegistry _registry;
-        private readonly ServerBase _commonServer;
+        private ServerBase _commonServer;
 
         private bool _isInitialized;
 
         public IUserInterface(KernelContext context, SmRegistry registry) : base(registerTipc: true)
         {
-            _commonServer = new ServerBase(context, "CommonServer");
             _registry = registry;
         }
 
@@ -97,6 +96,11 @@ namespace Ryujinx.HLE.HOS.Services.Sm
 
                     IpcService service = GetServiceInstance(type, context, serviceAttribute.Parameter);
 
+                    if (_commonServer is null)
+                    {
+                        _commonServer = new ServerBase(context.Device.System.KernelContext, "Common");
+                    }
+                    
                     service.TrySetServer(_commonServer);
                     service.Server.AddSessionObj(session.ServerSession, service);
                 }
@@ -253,7 +257,7 @@ namespace Ryujinx.HLE.HOS.Services.Sm
 
         public override void DestroyAtExit()
         {
-            _commonServer.Dispose();
+            _commonServer?.Dispose();
 
             base.DestroyAtExit();
         }

src/Ryujinx.HLE/HOS/Services/Ssl/ISslService.cs

@@ -17,7 +17,7 @@ namespace Ryujinx.HLE.HOS.Services.Ssl
         public ISslService(ServiceCtx context) { }
 
         [CommandCmif(0)]
-        // CreateContext(nn::ssl::sf::SslVersion, u64, pid) -> object<nn::ssl::sf::ISslContext>
+        // CreateContext(nn::ssl::sf::SslVersion, u64 pid_placeholder, pid) -> object<nn::ssl::sf::ISslContext>
         public ResultCode CreateContext(ServiceCtx context)
         {
             SslVersion sslVersion = (SslVersion)context.RequestData.ReadUInt32();
@@ -126,14 +126,18 @@ namespace Ryujinx.HLE.HOS.Services.Ssl
         }
 
         [CommandCmif(100)]
-        // CreateContextForSystem(u64 pid, nn::ssl::sf::SslVersion, u64)
+        // CreateContextForSystem(nn::ssl::sf::SslVersion, u64 pid_placeholder, pid) -> object<nn::ssl::sf::ISslContextForSystem>
         public ResultCode CreateContextForSystem(ServiceCtx context)
         {
-            ulong pid = context.RequestData.ReadUInt64();
             SslVersion sslVersion = (SslVersion)context.RequestData.ReadUInt32();
+#pragma warning disable IDE0059 // Remove unnecessary value assignment
             ulong pidPlaceholder = context.RequestData.ReadUInt64();
+#pragma warning restore IDE0059
 
-            Logger.Stub?.PrintStub(LogClass.ServiceSsl, new { pid, sslVersion, pidPlaceholder });
+            // Note: We use ISslContext here instead of ISslContextForSystem class because Ryujinx implements both in one class.
+            MakeObject(context, new ISslContext(context.Request.HandleDesc.PId, sslVersion));
+
+            Logger.Stub?.PrintStub(LogClass.ServiceSsl, new { sslVersion });
 
             return ResultCode.Success;
         }

src/Ryujinx.HLE/Loaders/Processes/ProcessLoader.cs

@@ -14,7 +14,6 @@ using Ryujinx.HLE.Loaders.Executables;
 using Ryujinx.HLE.Loaders.Processes.Extensions;
 using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
 using System.IO;
 using Path = System.IO.Path;
 
@@ -28,15 +27,10 @@ namespace Ryujinx.HLE.Loaders.Processes
 
         private ulong _latestPid;
 
-        public ProcessResult? ActiveApplication
+        public ProcessResult ActiveApplication
         {
             get
             {
-                return _processesByPid.GetValueOrDefault(_latestPid);
-                
-                // Using this if statement locks up the UI and prevents a new game from loading.
-                // Haven't quite deduced why yet.
-                
                 if (!_processesByPid.TryGetValue(_latestPid, out ProcessResult value))
                     throw new RyujinxException(
                         $"The HLE Process map did not have a process with ID {_latestPid}. Are you missing firmware?");
@@ -150,7 +144,7 @@ namespace Ryujinx.HLE.Loaders.Processes
         public bool LoadUnpackedNca(string exeFsDirPath, string romFsPath = null)
         {
             ProcessResult processResult = new LocalFileSystem(exeFsDirPath).Load(_device, romFsPath);
-            
+
             if (processResult.ProcessId != 0 && _processesByPid.TryAdd(processResult.ProcessId, processResult))
             {
                 if (processResult.Start(_device))

src/Ryujinx.HLE/Loaders/Processes/ProcessResult.cs

@@ -4,6 +4,7 @@ using LibHac.Ns;
 using Ryujinx.Common.Logging;
 using Ryujinx.Cpu;
 using Ryujinx.HLE.HOS.SystemState;
+using Ryujinx.HLE.Loaders.Processes.Extensions;
 using Ryujinx.Horizon.Common;
 
 namespace Ryujinx.HLE.Loaders.Processes
@@ -51,7 +52,6 @@ namespace Ryujinx.HLE.Loaders.Processes
 
             if (metaLoader is not null)
             {
-                Logger.Info?.Print(LogClass.Application,$"metaLoader: {metaLoader}");
                 ulong programId = metaLoader.ProgramId;
 
                 Name = ApplicationControlProperties.Title[(int)titleLanguage].NameString.ToString();
@@ -71,15 +71,8 @@ namespace Ryujinx.HLE.Loaders.Processes
                 ProgramId = programId;
                 ProgramIdText = $"{programId:x16}";
                 Is64Bit = metaLoader.IsProgram64Bit;
-            } 
-            
-            else
-            {
-                Logger.Error?.Print(LogClass.Application,$"metaLoader is null !!!");
-                ProcessId = 0;
-                return;
             }
-            
+
             DiskCacheEnabled = diskCacheEnabled;
             AllowCodeMemoryForJit = allowCodeMemoryForJit;
         }

src/Ryujinx.Horizon/ServiceEntry.cs

@@ -9,12 +9,14 @@ namespace Ryujinx.Horizon
         private readonly Action<ServiceTable> _entrypoint;
         private readonly ServiceTable _serviceTable;
         private readonly HorizonOptions _options;
+        public readonly string Name;
 
-        internal ServiceEntry(Action<ServiceTable> entrypoint, ServiceTable serviceTable, HorizonOptions options)
+        internal ServiceEntry(Action<ServiceTable> entrypoint, ServiceTable serviceTable, HorizonOptions options, string name)
         {
             _entrypoint = entrypoint;
             _serviceTable = serviceTable;
             _options = options;
+            Name = name;
         }
 
         public void Start(ISyscallApi syscallApi, IVirtualMemoryManager addressSpace, IThreadContext threadContext)

src/Ryujinx.Horizon/ServiceTable.cs

@@ -37,7 +37,7 @@ namespace Ryujinx.Horizon
 
             void RegisterService<T>() where T : IService
             {
-                entries.Add(new ServiceEntry(T.Main, this, options));
+                entries.Add(new ServiceEntry(T.Main, this, options, typeof(T).Name));
             }
 
             RegisterService<ArpMain>();

src/Ryujinx/Ryujinx.csproj

@@ -49,7 +49,7 @@
     <PackageReference Include="Svg.Controls.Avalonia" />
     <PackageReference Include="Svg.Controls.Skia.Avalonia" />
     <PackageReference Include="DynamicData" />
-    <PackageReference Include="FluentAvaloniaUI.NoAnim" />
+    <PackageReference Include="FluentAvaloniaUI" />
     <PackageReference Include="CommandLineParser" />
     <PackageReference Include="CommunityToolkit.Mvvm" />
     <PackageReference Include="DiscordRichPresence" />

src/Ryujinx/Systems/AppHost.cs

@@ -62,7 +62,7 @@ using VSyncMode = Ryujinx.Common.Configuration.VSyncMode;
 
 namespace Ryujinx.Ava.Systems
 {
-    internal class AppHost : IDisposable
+    internal class AppHost
     {
         private const int CursorHideIdleTime = 5; // Hide Cursor seconds.
         private const float MaxResolutionScale = 4.0f; // Max resolution hotkeys can scale to before wrapping.
@@ -438,7 +438,7 @@ namespace Ryujinx.Ava.Systems
 
                         SaveBitmapAsPng(bitmapToSave, path);
 
-                        Logger.Notice.Print(LogClass.Application, $"Screenshot saved to '{path}'.", "Screenshot");
+                        Logger.Notice.Print(LogClass.Application, $"Screenshot saved to {path}", "Screenshot");
                     }
                 });
             }
@@ -611,40 +611,27 @@ namespace Ryujinx.Ava.Systems
 
             _isActive = false;
 
+            // NOTE: The render loop is allowed to stay alive until the renderer itself is disposed, as it may handle resource dispose.
+            // We only need to wait for all commands submitted during the main gpu loop to be processed.
+            _gpuDoneEvent.WaitOne();
+            _gpuDoneEvent.Dispose();
+
             DisplaySleep.Restore();
 
             NpadManager.Dispose();
             TouchScreenManager.Dispose();
             Device.Dispose();
-            
-            // NOTE: The render loop is allowed to stay alive until the renderer itself is disposed, as it may handle resource dispose.
-            // We only need to wait for all commands submitted during the main gpu loop to be processed.
-            // If the GPU has no work and is cancelled, we need to handle that as well.
 
-            WaitHandle.WaitAny(new[] { _gpuDoneEvent, _gpuCancellationTokenSource.Token.WaitHandle });
-            _gpuCancellationTokenSource.Dispose();
-            
-            // Waiting for work to be finished before we dispose.
-            if (_renderingStarted)
-            {
-                Device.Gpu.WaitUntilGpuReady();
-            }
-            
-            _gpuDoneEvent.Dispose();
-            
             DisposeGpu();
+
             AppExit?.Invoke(this, EventArgs.Empty);
         }
 
-        // MUST be public to inherit from IDisposable
-        public void Dispose()
+        private void Dispose()
         {
             if (Device.Processes != null)
-            {
-                MainWindowViewModel.UpdateGameMetadata(Device.Processes.ActiveApplication?.ProgramIdText, 
-                    _playTimer.Elapsed);
-            }
-            
+                MainWindowViewModel.UpdateGameMetadata(Device.Processes.ActiveApplication.ProgramIdText, _playTimer.Elapsed);
+
             ConfigurationState.Instance.System.IgnoreMissingServices.Event -= UpdateIgnoreMissingServicesState;
             ConfigurationState.Instance.Graphics.AspectRatio.Event -= UpdateAspectRatioState;
             ConfigurationState.Instance.System.EnableDockedMode.Event -= UpdateDockedModeState;
@@ -659,6 +646,7 @@ namespace Ryujinx.Ava.Systems
             _topLevel.PointerExited -= TopLevel_PointerExited;
 
             _gpuCancellationTokenSource.Cancel();
+            _gpuCancellationTokenSource.Dispose();
 
             _chrono.Stop();
             _playTimer.Stop();
@@ -684,12 +672,6 @@ namespace Ryujinx.Ava.Systems
             }
             else
             {
-                // No use waiting on something that never started work
-                if (_renderingStarted)
-                {
-                    Device.Gpu.WaitUntilGpuReady();
-                }
-                
                 Device.DisposeGpu();
             }
         }
@@ -704,7 +686,7 @@ namespace Ryujinx.Ava.Systems
             _cursorState = CursorStates.ForceChangeCursor;
         }
 
-        public async Task LoadGuestApplication(CancellationTokenSource cts, BlitStruct<ApplicationControlProperty>? customNacpData = null)
+        public async Task<bool> LoadGuestApplication(BlitStruct<ApplicationControlProperty>? customNacpData = null)
         {
             DiscordIntegrationModule.GuestAppStartedAt = Timestamps.Now;
 
@@ -733,8 +715,7 @@ namespace Ryujinx.Ava.Systems
                                 await UserErrorDialog.ShowUserErrorDialog(userError);
                                 Device.Dispose();
 
-                                cts.Cancel();
-                                throw new OperationCanceledException(cts.Token);
+                                return false;
                             }
                         }
 
@@ -743,11 +724,10 @@ namespace Ryujinx.Ava.Systems
                             await UserErrorDialog.ShowUserErrorDialog(userError);
                             Device.Dispose();
 
-                            cts.Cancel();
-                            throw new OperationCanceledException(cts.Token);
+                            return false;
                         }
 
-                        // Tell the user that we installed firmware for them.
+                        // Tell the user that we installed a firmware for them.
                         if (userError is UserError.NoFirmware)
                         {
                             firmwareVersion = ContentManager.GetCurrentFirmwareVersion();
@@ -767,8 +747,7 @@ namespace Ryujinx.Ava.Systems
                         await UserErrorDialog.ShowUserErrorDialog(userError);
                         Device.Dispose();
 
-                        cts.Cancel();
-                        throw new OperationCanceledException(cts.Token);
+                        return false;
                     }
                 }
             }
@@ -783,8 +762,7 @@ namespace Ryujinx.Ava.Systems
                 {
                     Device.Dispose();
 
-                    cts.Cancel();
-                    throw new OperationCanceledException(cts.Token);
+                    return false;
                 }
             }
             else if (Directory.Exists(ApplicationPath))
@@ -804,24 +782,20 @@ namespace Ryujinx.Ava.Systems
 
                     if (!Device.LoadCart(ApplicationPath, romFsFiles[0]))
                     {
-                        await ContentDialogHelper.CreateErrorDialog(
-                            "Please specify an unpacked game directory with a valid exefs or NSO/NRO.");
                         Device.Dispose();
 
-                        cts.Cancel();
-                        throw new OperationCanceledException(cts.Token);
+                        return false;
                     }
                 }
                 else
                 {
                     Logger.Info?.Print(LogClass.Application, "Loading as cart WITHOUT RomFS.");
+
                     if (!Device.LoadCart(ApplicationPath))
                     {
-                        await ContentDialogHelper.CreateErrorDialog(
-                            "Please specify an unpacked game directory with a valid exefs or NSO/NRO.");
                         Device.Dispose();
-                        cts.Cancel();
-                        throw new OperationCanceledException(cts.Token);
+
+                        return false;
                     }
                 }
             }
@@ -839,8 +813,7 @@ namespace Ryujinx.Ava.Systems
                             {
                                 Device.Dispose();
 
-                                cts.Cancel();
-                                throw new OperationCanceledException(cts.Token);
+                                return false;
                             }
 
                             break;
@@ -853,8 +826,7 @@ namespace Ryujinx.Ava.Systems
                             {
                                 Device.Dispose();
 
-                                cts.Cancel();
-                                throw new OperationCanceledException(cts.Token);
+                                return false;
                             }
 
                             break;
@@ -868,8 +840,7 @@ namespace Ryujinx.Ava.Systems
                             {
                                 Device.Dispose();
 
-                                cts.Cancel();
-                                throw new OperationCanceledException(cts.Token);
+                                return false;
                             }
 
                             break;
@@ -884,8 +855,7 @@ namespace Ryujinx.Ava.Systems
                                 {
                                     Device.Dispose();
 
-                                    cts.Cancel();
-                                    throw new OperationCanceledException(cts.Token);
+                                    return false;
                                 }
                             }
                             catch (ArgumentOutOfRangeException)
@@ -894,8 +864,7 @@ namespace Ryujinx.Ava.Systems
 
                                 Device.Dispose();
 
-                                cts.Cancel();
-                                throw new OperationCanceledException(cts.Token);
+                                return false;
                             }
 
                             break;
@@ -904,18 +873,19 @@ namespace Ryujinx.Ava.Systems
             }
             else
             {
-                Logger.Warning?.Print(LogClass.Application, "Please specify a valid XCI/NCA/NSP/PFS0/NSO/NRO file.");
+                Logger.Warning?.Print(LogClass.Application, "Please specify a valid XCI/NCA/NSP/PFS0/NRO file.");
 
                 Device.Dispose();
 
-                cts.Cancel();
-                throw new OperationCanceledException(cts.Token);
+                return false;
             }
 
             ApplicationLibrary.LoadAndSaveMetaData(Device.Processes.ActiveApplication.ProgramIdText,
                 appMetadata => appMetadata.UpdatePreGame()
             );
             _playTimer.Start();
+
+            return true;
         }
 
         internal void Resume()
@@ -925,7 +895,7 @@ namespace Ryujinx.Ava.Systems
             _viewModel.IsPaused = false;
             _playTimer.Start();
             _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI);
-            Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed.");
+            Logger.Info?.Print(LogClass.Emulation, "Emulation was resumed");
         }
 
         internal void Pause()
@@ -935,7 +905,7 @@ namespace Ryujinx.Ava.Systems
             _viewModel.IsPaused = true;
             _playTimer.Stop();
             _viewModel.Title = TitleHelper.ActiveApplicationTitle(Device?.Processes.ActiveApplication, Program.Version, !ConfigurationState.Instance.ShowOldUI, LocaleManager.Instance[LocaleKeys.Paused]);
-            Logger.Info?.Print(LogClass.Emulation, "Emulation was paused.");
+            Logger.Info?.Print(LogClass.Emulation, "Emulation was paused");
         }
 
         private void InitEmulatedSwitch()
@@ -1134,9 +1104,7 @@ namespace Ryujinx.Ava.Systems
                 // Make sure all commands in the run loop are fully executed before leaving the loop.
                 if (Device.Gpu.Renderer is ThreadedRenderer threaded)
                 {
-                    Logger.Info?.PrintMsg(LogClass.Gpu, "Flushing threaded commands...");
                     threaded.FlushThreadedCommands();
-                    Logger.Info?.PrintMsg(LogClass.Gpu, "Flushed!");
                 }
 
                 _gpuDoneEvent.Set();

src/Ryujinx/Systems/AppLibrary/ApplicationLibrary.cs

@@ -849,8 +849,7 @@ namespace Ryujinx.Ava.Systems.AppLibrary
 
             foreach (ApplicationData installedApplication in Applications.Items)
             {
-                // this should always exist... should...
-                temporary += LoadAndSaveMetaData(installedApplication.IdString).Value.TimePlayed;
+                temporary += LoadAndSaveMetaData(installedApplication.IdString).TimePlayed;
             }
 
             TotalTimePlayed = temporary;
@@ -1160,22 +1159,15 @@ namespace Ryujinx.Ava.Systems.AppLibrary
             ApplicationCountUpdated?.Invoke(null, e);
         }
 
-        public static Gommon.Optional<ApplicationMetadata> LoadAndSaveMetaData(string titleId, Action<ApplicationMetadata> modifyFunction = null)
+        public static ApplicationMetadata LoadAndSaveMetaData(string titleId, Action<ApplicationMetadata> modifyFunction = null)
         {
-            if (titleId is null)
-            {
-                Logger.Warning?.PrintMsg(LogClass.Application, "Cannot save metadata because title ID is invalid.");
-                return null;
-            }
-            
             string metadataFolder = Path.Combine(AppDataManager.GamesDirPath, titleId, "gui");
             string metadataFile = Path.Combine(metadataFolder, "metadata.json");
 
             ApplicationMetadata appMetadata;
-            
+
             if (!File.Exists(metadataFile))
             {
-                Logger.Info?.Print(LogClass.Application, $"Metadata file does not exist. Creating metadata for {titleId}...");
                 Directory.CreateDirectory(metadataFolder);
 
                 appMetadata = new ApplicationMetadata();
@@ -1185,12 +1177,12 @@ namespace Ryujinx.Ava.Systems.AppLibrary
 
             try
             {
-                Logger.Debug?.Print(LogClass.Application, $"Deserializing metadata for {titleId}...");
                 appMetadata = JsonHelper.DeserializeFromFile(metadataFile, _serializerContext.ApplicationMetadata);
             }
             catch (JsonException)
             {
                 Logger.Warning?.Print(LogClass.Application, $"Failed to parse metadata json for {titleId}. Loading defaults.");
+
                 appMetadata = new ApplicationMetadata();
             }
 

src/Ryujinx/Systems/DiscordIntegrationModule.cs

@@ -82,7 +82,7 @@ namespace Ryujinx.Ava.Systems
 
         public static void Use(Optional<string> titleId)
         {
-            if (titleId.TryGet(out string tid) && Switch.Shared.Processes.ActiveApplication is not null)
+            if (titleId.TryGet(out string tid))
                 SwitchToPlayingState(
                     ApplicationLibrary.LoadAndSaveMetaData(tid),
                     Switch.Shared.Processes.ActiveApplication

src/Ryujinx/UI/Models/SaveModel.cs

@@ -57,15 +57,8 @@ namespace Ryujinx.Ava.UI.Models
             }
             else
             {
-                Gommon.Optional<ApplicationMetadata> appMetadata = ApplicationLibrary.LoadAndSaveMetaData(TitleIdString);
-                if (appMetadata != null)
-                {
-                    Title = appMetadata.Value.Title ?? TitleIdString;
-                }
-                else
-                {
-                    Title = "<INVALID>";
-                }
+                ApplicationMetadata appMetadata = ApplicationLibrary.LoadAndSaveMetaData(TitleIdString);
+                Title = appMetadata.Title ?? TitleIdString;
             }
 
             Task.Run(() =>

src/Ryujinx/UI/RyujinxApp.axaml.cs

@@ -5,6 +5,7 @@ using Avalonia.Markup.Xaml;
 using Avalonia.Platform;
 using Avalonia.Styling;
 using Avalonia.Threading;
+using FluentAvalonia.Core;
 using FluentAvalonia.UI.Windowing;
 using Gommon;
 using Ryujinx.Ava.Common.Locale;
@@ -53,6 +54,9 @@ namespace Ryujinx.Ava
         {
             Name = FormatTitle();
 
+            // Disable menu animations
+            FAUISettings.SetAnimationsEnabledAtAppLevel(false);
+
             AvaloniaXamlLoader.Load(this);
 
             if (OperatingSystem.IsMacOS())

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -174,6 +174,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         private string _screenshotKey = "F8";
         private float _volume;
         private ApplicationData _currentApplicationData;
+        private bool _pendingRestart;
         private readonly AutoResetEvent _rendererWaitEvent;
         private int _customVSyncInterval;
         private int _customVSyncIntervalPercentageProxy;
@@ -1250,6 +1251,14 @@ namespace Ryujinx.Ava.UI.ViewModels
 
                 await LoadApplication(_currentApplicationData);
             }
+            else if (_pendingRestart)
+            {
+                _pendingRestart = false;
+
+                Logger.Info?.Print(LogClass.Application, $"Restarting emulation for '{_currentApplicationData.Name}'");
+
+                await LoadApplication(_currentApplicationData);
+            }
             else
             {
                 // Otherwise, clear state.
@@ -1258,6 +1267,21 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
+        public void RestartEmulation()
+        {
+            if (AppHost is null || _currentApplicationData is null)
+            {
+                Logger.Warning?.Print(LogClass.Application, "RestartEmulation called but no application is running.");
+
+                return;
+            }
+
+            Logger.Info?.Print(LogClass.Application, $"Restart requested for '{_currentApplicationData.Name}'");
+
+            _pendingRestart = true;
+            AppHost.Stop();
+        }
+
         private void Update_StatusBar(object sender, StatusUpdatedEventArgs args)
         {
             if (ShowMenuAndStatusBar && !ShowLoadProgress)
@@ -1736,6 +1760,11 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             Logger.RestartTime();
 
+            SelectedIcon ??= ApplicationLibrary.GetApplicationIcon(application.Path,
+                ConfigurationState.Instance.System.Language, application.Id);
+
+            PrepareLoadScreen();
+
             RendererHostControl = new RendererHost();
 
             AppHost = new AppHost(
@@ -1749,34 +1778,18 @@ namespace Ryujinx.Ava.UI.ViewModels
                 UserChannelPersistence,
                 this,
                 TopLevel);
-            
-            CancellationTokenSource cts = new CancellationTokenSource();
 
-            try
+            if (!await AppHost.LoadGuestApplication(customNacpData))
             {
-                await AppHost.LoadGuestApplication(cts, customNacpData);
-            }
-            catch (OperationCanceledException exception)
-            {
-                Logger.Info?.Print(LogClass.Application,
-                    "LoadGuestApplication was interrupted !!! " + exception.Message);
                 AppHost.DisposeContext();
                 AppHost = null;
+
                 return;
             }
-            finally
-            {
-                cts.Dispose();
-            }
-            
+
             CanUpdate = false;
 
             application.Name ??= AppHost.Device.Processes.ActiveApplication.Name;
-            
-            SelectedIcon ??= ApplicationLibrary.GetApplicationIcon(application.Path,
-                ConfigurationState.Instance.System.Language, application.Id);
-
-            PrepareLoadScreen();
 
             LoadHeading = LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.LoadingHeading, application.Name);
 
@@ -1798,9 +1811,9 @@ namespace Ryujinx.Ava.UI.ViewModels
                 RendererHostControl.Focus();
             });
 
-        public static void UpdateGameMetadata(string titleId, TimeSpan playTime) 
+        public static void UpdateGameMetadata(string titleId, TimeSpan playTime)
             => ApplicationLibrary.LoadAndSaveMetaData(titleId, appMetadata => appMetadata.UpdatePostGame(playTime));
-        
+
         public void RefreshFirmwareStatus()
         {
             SystemVersion version = null;

src/Ryujinx/UI/Views/Input/LedInputView.axaml

@@ -47,18 +47,13 @@
         </StackPanel>
         <StackPanel Orientation="Horizontal" IsEnabled="{Binding ShowLedColorPicker}">
             <TextBlock MinWidth="75" MaxWidth="200" Text="{ext:Locale ControllerSettingsLedColor}" />
-            <ui:ColorPickerButton
+            <ColorPicker
                 Margin="5"
-                IsMoreButtonVisible="False"
-                UseColorPalette="False"
-                UseColorTriangle="False"
-                UseColorWheel="False"
-                ShowAcceptDismissButtons="False"
                 IsAlphaEnabled="False"
-                AttachedToVisualTree="ColorPickerButton_OnAttachedToVisualTree"
-                ColorChanged="ColorPickerButton_OnColorChanged"
+                AttachedToVisualTree="ColorPicker_OnAttachedToVisualTree"
+                ColorChanged="ColorPicker_OnColorChanged"
                 Color="{Binding LedColor, Mode=TwoWay}">
-            </ui:ColorPickerButton>
+            </ColorPicker>
         </StackPanel>
     </StackPanel>
 </UserControl>

src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs

@@ -1,4 +1,5 @@
 using Avalonia;
+using Avalonia.Controls;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Controls;
@@ -30,19 +31,17 @@ namespace Ryujinx.UI.Views.Input
             InitializeComponent();
         }
 
-        private void ColorPickerButton_OnColorChanged(ColorPickerButton sender, ColorButtonColorChangedEventArgs args)
+        private void ColorPicker_OnColorChanged(object sender, ColorChangedEventArgs args)
         {
-            if (!args.NewColor.HasValue)
-                return;
             if (!ViewModel.EnableLedChanging)
                 return;
             if (ViewModel.TurnOffLed)
                 return;
 
-            ViewModel.ParentModel.SelectedGamepad.SetLed(args.NewColor.Value.ToUInt32());
+            ViewModel.ParentModel.SelectedGamepad.SetLed(args.NewColor.ToUInt32());
         }
 
-        private void ColorPickerButton_OnAttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
+        private void ColorPicker_OnAttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
         {
             if (!ViewModel.EnableLedChanging)
                 return;

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml

@@ -167,6 +167,12 @@
                     Icon="{ext:Icon fa-solid fa-stop}"
                     InputGesture="Escape"
                     IsEnabled="{Binding IsGameRunning}" />
+                <MenuItem
+                    Name="RestartEmulationMenuItem"
+                    Header="{ext:Locale MenuBarOptionsRestartEmulation}"
+                    Icon="{ext:Icon fa-solid fa-rotate-right}"
+                    InputGesture="Ctrl + R"
+                    IsEnabled="{Binding IsGameRunning}" />
                 <MenuItem Command="{Binding SimulateWakeUpMessage}" Header="{ext:Locale MenuBarOptionsSimulateWakeUpMessage}" Icon="{ext:Icon fa-solid fa-sun}" />
                 <Separator />
                 <MenuItem

src/Ryujinx/UI/Views/Main/MainMenuBarView.axaml.cs

@@ -43,6 +43,7 @@ namespace Ryujinx.Ava.UI.Views.Main
             PauseEmulationMenuItem.Command = Commands.Create(() => ViewModel.AppHost?.Pause());
             ResumeEmulationMenuItem.Command = Commands.Create(() => ViewModel.AppHost?.Resume());
             StopEmulationMenuItem.Command = Commands.Create(() => ViewModel.AppHost?.ShowExitPrompt().OrCompleted());
+            RestartEmulationMenuItem.Command = Commands.Create(() => ViewModel.RestartEmulation());
             CheatManagerMenuItem.Command = Commands.CreateSilentFail(OpenCheatManagerForCurrentApp);
             InstallFileTypesMenuItem.Command = Commands.Create(InstallFileTypes);
             UninstallFileTypesMenuItem.Command = Commands.Create(UninstallFileTypes);

src/Ryujinx/UI/Views/User/UserFirmwareAvatarSelectorView.axaml

@@ -78,22 +78,16 @@
             Spacing="10"
             Margin="0 24 0 0"
             HorizontalAlignment="Right">
-            <ui:ColorPickerButton
-                FlyoutPlacement="Top"
-                IsMoreButtonVisible="False"
-                UseColorPalette="False"
-                UseColorTriangle="False"
-                UseColorWheel="False"
-                ShowAcceptDismissButtons="False"
+            <ColorPicker
                 IsAlphaEnabled="False"
                 Color="{Binding BackgroundColor, Mode=TwoWay}"
                 Name="ColorButton">
-                <ui:ColorPickerButton.Styles>
+                <ColorPicker.Styles>
                     <Style Selector="Grid#Root > DockPanel > Grid">
                         <Setter Property="IsVisible" Value="False" />
                     </Style>
-                </ui:ColorPickerButton.Styles>
-            </ui:ColorPickerButton>
+                </ColorPicker.Styles>
+            </ColorPicker>
             <Button
                 Content="{ext:Locale AvatarChoose}"
                 Height="35"

src/Ryujinx/UI/Windows/MainWindow.axaml

@@ -41,6 +41,7 @@
         <KeyBinding Gesture="Escape" Command="{Binding ExitCurrentState}" />
         <KeyBinding Gesture="Ctrl+A" Command="{Binding OpenAmiiboWindow}" />
         <KeyBinding Gesture="Ctrl+B" Command="{Binding OpenBinFile}" />
+        <KeyBinding Gesture="Ctrl+R" Command="{Binding RestartEmulation}" />
         <KeyBinding Gesture="Ctrl+Shift+R" Command="{Binding ReloadRenderDocApi}" />
         <KeyBinding Gesture="Ctrl+Shift+C" Command="{Binding ToggleCapture}" />
     </Window.KeyBindings>