Add missing "yield return" (#424)

Partially resolves #355. I think that wanted automatic. If automatic functionality is still desired even with this change then that will be considered.

src/Ryujinx.Common/ReleaseInformation.cs

@@ -6,7 +6,6 @@ namespace Ryujinx.Common
     // DO NOT EDIT, filled by CI
     public static class ReleaseInformation
     {
-        private const string FlatHubChannel = "flathub";
         private const string CanaryChannel = "canary";
         private const string ReleaseChannel = "release";
 
@@ -29,8 +28,6 @@ namespace Ryujinx.Common
             !ReleaseChannelRepo.StartsWith("%%") &&
             !ConfigFileName.StartsWith("%%");
 
-        public static bool IsFlatHubBuild => IsValid && ReleaseChannelOwner.Equals(FlatHubChannel);
-
         public static bool IsCanaryBuild => IsValid && ReleaseChannelName.Equals(CanaryChannel);
         
         public static bool IsReleaseBuild => IsValid && ReleaseChannelName.Equals(ReleaseChannel);

src/Ryujinx.Common/Utilities/JsonHelper.cs

@@ -1,3 +1,4 @@
+using System;
 using System.IO;
 using System.Text;
 using System.Text.Json;
@@ -27,9 +28,14 @@ namespace Ryujinx.Common.Utilities
                 ReadCommentHandling = JsonCommentHandling.Skip
             };
 
-        public static string Serialize<T>(T value, JsonTypeInfo<T> typeInfo) => JsonSerializer.Serialize(value, typeInfo);
+        public static string Serialize<T>(T value, JsonTypeInfo<T> typeInfo) 
+            => JsonSerializer.Serialize(value, typeInfo);
 
-        public static T Deserialize<T>(string value, JsonTypeInfo<T> typeInfo) => JsonSerializer.Deserialize(value, typeInfo);
+        public static T Deserialize<T>(string value, JsonTypeInfo<T> typeInfo) 
+            => JsonSerializer.Deserialize(value, typeInfo);
+
+        public static T Deserialize<T>(ReadOnlySpan<byte> utf8Value, JsonTypeInfo<T> typeInfo) 
+            => JsonSerializer.Deserialize<T>(utf8Value, typeInfo);
 
         public static void SerializeToFile<T>(string filePath, T value, JsonTypeInfo<T> typeInfo)
         {

src/Ryujinx.Cpu/AppleHv/HvMemoryManager.cs

@@ -230,25 +230,20 @@ namespace Ryujinx.Cpu.AppleHv
         {
             if (size == 0)
             {
-                return Enumerable.Empty<HostMemoryRange>();
+                yield break;
             }
 
             var guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
-                return null;
+                yield break;
             }
 
-            var regions = new HostMemoryRange[guestRegions.Count];
+            foreach (var guestRegion in guestRegions)
-
-            for (int i = 0; i < regions.Length; i++)
             {
-                var guestRegion = guestRegions[i];
                 nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
-                regions[i] = new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
+                yield return new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
             }
-
-            return regions;
         }
 
         /// <inheritdoc/>
@@ -256,23 +251,24 @@ namespace Ryujinx.Cpu.AppleHv
         {
             if (size == 0)
             {
-                return Enumerable.Empty<MemoryRange>();
+                yield break;
             }
 
-            return GetPhysicalRegionsImpl(va, size);
+            foreach (var physicalRegion in GetPhysicalRegionsImpl(va, size))
+            {
+                yield return physicalRegion;
+            }
         }
 
-        private List<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
+        private IEnumerable<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                return null;
+                yield break;
             }
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
-
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;
 
@@ -280,14 +276,14 @@ namespace Ryujinx.Cpu.AppleHv
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    return null;
+                    yield break;
                 }
 
                 ulong newPa = GetPhysicalAddressInternal(va + PageSize);
 
                 if (GetPhysicalAddressInternal(va) + PageSize != newPa)
                 {
-                    regions.Add(new MemoryRange(regionStart, regionSize));
+                    yield return new MemoryRange(regionStart, regionSize);
                     regionStart = newPa;
                     regionSize = 0;
                 }
@@ -296,9 +292,7 @@ namespace Ryujinx.Cpu.AppleHv
                 regionSize += PageSize;
             }
 
-            regions.Add(new MemoryRange(regionStart, regionSize));
+            yield return new MemoryRange(regionStart, regionSize);
-
-            return regions;
         }
 
         /// <remarks>

src/Ryujinx.Cpu/Jit/HostTracked/AddressSpacePartitionAllocator.cs

@@ -115,6 +115,9 @@ namespace Ryujinx.Cpu.Jit.HostTracked
             }
 
             private readonly AddressIntrusiveRedBlackTree<Mapping> _mappingTree;
+            
+            // type is not Lock due to the unique usage of this mechanism,
+            // an arbitrary object is used as the lock passed in by constructor.
             private readonly object _lock;
 
             public Block(MemoryTracking tracking, Func<ulong, ulong> readPtCallback, MemoryBlock memory, ulong size, object locker) : base(memory, size)
@@ -174,6 +177,9 @@ namespace Ryujinx.Cpu.Jit.HostTracked
 
         private readonly MemoryTracking _tracking;
         private readonly Func<ulong, ulong> _readPtCallback;
+        
+        // type is not Lock due to the unique usage of this mechanism,
+        // an arbitrary object is used as the lock passed in by constructor.
         private readonly object _lock;
 
         public AddressSpacePartitionAllocator(

src/Ryujinx.Cpu/Jit/MemoryManager.cs

@@ -250,25 +250,20 @@ namespace Ryujinx.Cpu.Jit
         {
             if (size == 0)
             {
-                return Enumerable.Empty<HostMemoryRange>();
+                yield break;
             }
 
             var guestRegions = GetPhysicalRegionsImpl(va, size);
             if (guestRegions == null)
             {
-                return null;
+                yield break;
             }
 
-            var regions = new HostMemoryRange[guestRegions.Count];
+            foreach (var guestRegion in guestRegions)
-
-            for (int i = 0; i < regions.Length; i++)
             {
-                var guestRegion = guestRegions[i];
                 nint pointer = _backingMemory.GetPointer(guestRegion.Address, guestRegion.Size);
-                regions[i] = new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
+                yield return new HostMemoryRange((nuint)(ulong)pointer, guestRegion.Size);
             }
-
-            return regions;
         }
 
         /// <inheritdoc/>
@@ -276,23 +271,24 @@ namespace Ryujinx.Cpu.Jit
         {
             if (size == 0)
             {
-                return Enumerable.Empty<MemoryRange>();
+                yield break;
             }
 
-            return GetPhysicalRegionsImpl(va, size);
+            foreach (var physicalRegion in GetPhysicalRegionsImpl(va, size))
+            {
+                yield return physicalRegion;
+            }
         }
 
-        private List<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
+        private IEnumerable<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                return null;
+                yield break;
             }
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
-
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;
 
@@ -300,14 +296,14 @@ namespace Ryujinx.Cpu.Jit
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    return null;
+                    yield break;
                 }
 
                 ulong newPa = GetPhysicalAddressInternal(va + PageSize);
 
                 if (GetPhysicalAddressInternal(va) + PageSize != newPa)
                 {
-                    regions.Add(new MemoryRange(regionStart, regionSize));
+                    yield return new MemoryRange(regionStart, regionSize);
                     regionStart = newPa;
                     regionSize = 0;
                 }
@@ -316,9 +312,7 @@ namespace Ryujinx.Cpu.Jit
                 regionSize += PageSize;
             }
 
-            regions.Add(new MemoryRange(regionStart, regionSize));
+            yield return new MemoryRange(regionStart, regionSize);
-
-            return regions;
         }
 
         /// <inheritdoc/>

src/Ryujinx.Cpu/Jit/MemoryManagerHostTracked.cs

@@ -475,17 +475,15 @@ namespace Ryujinx.Cpu.Jit
             return GetPhysicalRegionsImpl(va, size);
         }
 
-        private List<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
+        private IEnumerable<MemoryRange> GetPhysicalRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                return null;
+                yield break;
             }
 
             int pages = GetPagesCount(va, (uint)size, out va);
 
-            var regions = new List<MemoryRange>();
-
             ulong regionStart = GetPhysicalAddressInternal(va);
             ulong regionSize = PageSize;
 
@@ -493,14 +491,14 @@ namespace Ryujinx.Cpu.Jit
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    return null;
+                    yield break;
                 }
 
                 ulong newPa = GetPhysicalAddressInternal(va + PageSize);
 
                 if (GetPhysicalAddressInternal(va) + PageSize != newPa)
                 {
-                    regions.Add(new MemoryRange(regionStart, regionSize));
+                    yield return new MemoryRange(regionStart, regionSize);
                     regionStart = newPa;
                     regionSize = 0;
                 }
@@ -509,9 +507,7 @@ namespace Ryujinx.Cpu.Jit
                 regionSize += PageSize;
             }
 
-            regions.Add(new MemoryRange(regionStart, regionSize));
+            yield return new MemoryRange(regionStart, regionSize);
-
-            return regions;
         }
 
         /// <inheritdoc/>

src/Ryujinx.Cpu/LightningJit/CodeGen/Arm64/StackWalker.cs

@@ -8,8 +8,6 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
     {
         public IEnumerable<ulong> GetCallStack(nint framePointer, nint codeRegionStart, int codeRegionSize, nint codeRegion2Start, int codeRegion2Size)
         {
-            List<ulong> functionPointers = new();
-
             while (true)
             {
                 nint functionPointer = Marshal.ReadIntPtr(framePointer, nint.Size);
@@ -20,11 +18,9 @@ namespace Ryujinx.Cpu.LightningJit.CodeGen.Arm64
                     break;
                 }
 
-                functionPointers.Add((ulong)functionPointer - 4);
+                yield return (ulong)functionPointer - 4;
                 framePointer = Marshal.ReadIntPtr(framePointer);
             }
-
-            return functionPointers;
         }
     }
 }

src/Ryujinx.Graphics.Vulkan/BufferMirrorRangeList.cs

@@ -168,16 +168,14 @@ namespace Ryujinx.Graphics.Vulkan
             return BinarySearch(list, offset, size) >= 0;
         }
 
-        public readonly List<Range> FindOverlaps(int offset, int size)
+        public readonly IEnumerable<Range> FindOverlaps(int offset, int size)
         {
             var list = _ranges;
             if (list == null)
             {
-                return null;
+                yield break;
             }
 
-            List<Range> result = null;
-
             int index = BinarySearch(list, offset, size);
 
             if (index >= 0)
@@ -189,12 +187,10 @@ namespace Ryujinx.Graphics.Vulkan
 
                 do
                 {
-                    (result ??= new List<Range>()).Add(list[index++]);
+                    yield return list[index++];
                 }
                 while (index < list.Count && list[index].OverlapsWith(offset, size));
             }
-
-            return result;
         }
 
         private static int BinarySearch(List<Range> list, int offset, int size)

src/Ryujinx.HLE/HOS/Kernel/Common/KResourceLimit.cs

@@ -15,6 +15,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Common
         private readonly long[] _current2;
         private readonly long[] _peak;
 
+        // type is not Lock due to Monitor class usage
         private readonly object _lock = new();
 
         private readonly LinkedList<KThread> _waitingThreads;

src/Ryujinx.HLE/HOS/Kernel/Threading/KCriticalSection.cs

@@ -5,10 +5,10 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
     class KCriticalSection
     {
         private readonly KernelContext _context;
-        private readonly object _lock = new();
         private int _recursionCount;
-
+        
-        public object Lock => _lock;
+        // type is not Lock due to Monitor class usage
+        public object Lock { get; } = new();
 
         public KCriticalSection(KernelContext context)
         {
@@ -17,7 +17,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
 
         public void Enter()
         {
-            Monitor.Enter(_lock);
+            Monitor.Enter(Lock);
 
             _recursionCount++;
         }
@@ -33,7 +33,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             {
                 ulong scheduledCoresMask = KScheduler.SelectThreads(_context);
 
-                Monitor.Exit(_lock);
+                Monitor.Exit(Lock);
 
                 KThread currentThread = KernelStatic.GetCurrentThread();
                 bool isCurrentThreadSchedulable = currentThread != null && currentThread.IsSchedulable;
@@ -56,7 +56,7 @@ namespace Ryujinx.HLE.HOS.Kernel.Threading
             }
             else
             {
-                Monitor.Exit(_lock);
+                Monitor.Exit(Lock);
             }
         }
     }

src/Ryujinx.HLE/HOS/ModLoader.cs

@@ -357,7 +357,6 @@ namespace Ryujinx.HLE.HOS
         {
             string cheatName = DefaultCheatName;
             List<string> instructions = new();
-            List<Cheat> cheats = new();
 
             using StreamReader cheatData = cheatFile.OpenText();
             while (cheatData.ReadLine() is { } line)
@@ -373,13 +372,13 @@ namespace Ryujinx.HLE.HOS
 
                         Logger.Warning?.Print(LogClass.ModLoader, $"Ignoring cheat '{cheatFile.FullName}' because it is malformed");
 
-                        return Array.Empty<Cheat>();
+                        yield break;
                     }
 
                     // Add the previous section to the list.
                     if (instructions.Count > 0)
                     {
-                        cheats.Add(new Cheat($"<{cheatName} Cheat>", cheatFile, instructions));
+                        yield return new Cheat($"<{cheatName} Cheat>", cheatFile, instructions);
                     }
 
                     // Start a new cheat section.
@@ -396,10 +395,8 @@ namespace Ryujinx.HLE.HOS
             // Add the last section being processed.
             if (instructions.Count > 0)
             {
-                cheats.Add(new Cheat($"<{cheatName} Cheat>", cheatFile, instructions));
+                yield return new Cheat($"<{cheatName} Cheat>", cheatFile, instructions);
             }
-
-            return cheats;
         }
 
         // Assumes searchDirPaths don't overlap

src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboBinReader.cs

@@ -333,7 +333,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
             return Path.Combine(AppDataManager.KeysDirPath, "key_retail.bin");
         }
 
-        public static bool HasKeyRetailBinPath => File.Exists(GetKeyRetailBinPath());
+        public static bool HasAmiiboKeyFile => File.Exists(GetKeyRetailBinPath());
 
         
         public static DateTime DateTimeFromTag(ushort value)

src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboDump.cs

@@ -36,7 +36,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
 
         private byte[] DeriveKey(AmiiboMasterKey key, bool deriveAes, out byte[] derivedAesKey, out byte[] derivedAesIv)
         {
-            List<byte> seed = new List<byte>();
+            List<byte> seed = [];
 
             // Start with the type string (14 bytes)
             seed.AddRange(key.TypeString);

src/Ryujinx.HLE/HOS/Services/Nfc/AmiiboDecryption/AmiiboMasterKey.cs

@@ -33,10 +33,7 @@ namespace Ryujinx.HLE.HOS.Services.Nfc.AmiiboDecryption
             byte[] dataBin = combinedBin.Take(80).ToArray();
             byte[] tagBin = combinedBin.Skip(80).Take(80).ToArray();
 
-            AmiiboMasterKey dataKey = new AmiiboMasterKey(dataBin);
+            return (new AmiiboMasterKey(dataBin), new AmiiboMasterKey(tagBin));
-            AmiiboMasterKey tagKey = new AmiiboMasterKey(tagBin);
-
-            return (dataKey, tagKey);
         }
     }
 }

src/Ryujinx.HLE/HOS/Services/Sockets/Bsd/Impl/EventFileDescriptor.cs

@@ -10,6 +10,7 @@ namespace Ryujinx.HLE.HOS.Services.Sockets.Bsd.Impl
         private ulong _value;
         private readonly EventFdFlags _flags;
 
+        // type is not Lock due to Monitor class usage
         private readonly object _lock = new();
 
         public bool Blocking { get => !_flags.HasFlag(EventFdFlags.NonBlocking); set => throw new NotSupportedException(); }

src/Ryujinx.Memory/AddressSpaceManager.cs

@@ -106,10 +106,13 @@ namespace Ryujinx.Memory
         {
             if (size == 0)
             {
-                return Enumerable.Empty<HostMemoryRange>();
+                yield break;
             }
 
-            return GetHostRegionsImpl(va, size);
+            foreach (var hostRegion in GetHostRegionsImpl(va, size))
+            {
+                yield return hostRegion;
+            }
         }
 
         /// <inheritdoc/>
@@ -117,51 +120,36 @@ namespace Ryujinx.Memory
         {
             if (size == 0)
             {
-                return Enumerable.Empty<MemoryRange>();
+                yield break;
             }
 
             var hostRegions = GetHostRegionsImpl(va, size);
             if (hostRegions == null)
             {
-                return null;
+                yield break;
             }
 
-            var regions = new MemoryRange[hostRegions.Count];
-
             ulong backingStart = (ulong)_backingMemory.Pointer;
             ulong backingEnd = backingStart + _backingMemory.Size;
 
-            int count = 0;
+            foreach (var hostRegion in hostRegions)
-
-            for (int i = 0; i < regions.Length; i++)
             {
-                var hostRegion = hostRegions[i];
-
                 if (hostRegion.Address >= backingStart && hostRegion.Address < backingEnd)
                 {
-                    regions[count++] = new MemoryRange(hostRegion.Address - backingStart, hostRegion.Size);
+                    yield return new MemoryRange(hostRegion.Address - backingStart, hostRegion.Size);
                 }
             }
-
-            if (count != regions.Length)
-            {
-                return new ArraySegment<MemoryRange>(regions, 0, count);
-            }
-
-            return regions;
         }
 
-        private List<HostMemoryRange> GetHostRegionsImpl(ulong va, ulong size)
+        private IEnumerable<HostMemoryRange> GetHostRegionsImpl(ulong va, ulong size)
         {
             if (!ValidateAddress(va) || !ValidateAddressAndSize(va, size))
             {
-                return null;
+                yield break;
             }
 
             int pages = GetPagesCount(va, size, out va);
 
-            var regions = new List<HostMemoryRange>();
-
             nuint regionStart = GetHostAddress(va);
             ulong regionSize = PageSize;
 
@@ -169,14 +157,14 @@ namespace Ryujinx.Memory
             {
                 if (!ValidateAddress(va + PageSize))
                 {
-                    return null;
+                    yield break;
                 }
 
                 nuint newHostAddress = GetHostAddress(va + PageSize);
 
                 if (GetHostAddress(va) + PageSize != newHostAddress)
                 {
-                    regions.Add(new HostMemoryRange(regionStart, regionSize));
+                    yield return new HostMemoryRange(regionStart, regionSize);
                     regionStart = newHostAddress;
                     regionSize = 0;
                 }
@@ -185,9 +173,7 @@ namespace Ryujinx.Memory
                 regionSize += PageSize;
             }
 
-            regions.Add(new HostMemoryRange(regionStart, regionSize));
+            yield return new HostMemoryRange(regionStart, regionSize);
-
-            return regions;
         }
 
         [MethodImpl(MethodImplOptions.AggressiveInlining)]

src/Ryujinx.UI.Common/Helper/FileAssociationHelper.cs

@@ -23,7 +23,7 @@ namespace Ryujinx.UI.Common.Helper
         [LibraryImport("shell32.dll", SetLastError = true)]
         public static partial void SHChangeNotify(uint wEventId, uint uFlags, nint dwItem1, nint dwItem2);
 
-        public static bool IsTypeAssociationSupported => (OperatingSystem.IsLinux() || OperatingSystem.IsWindows()) && !ReleaseInformation.IsFlatHubBuild;
+        public static bool IsTypeAssociationSupported => (OperatingSystem.IsLinux() || OperatingSystem.IsWindows());
         
         public static bool AreMimeTypesRegistered
         {

src/Ryujinx.UI.Common/Helper/OpenHelper.cs

@@ -1,3 +1,4 @@
+using Gommon;
 using Ryujinx.Common.Logging;
 using System;
 using System.Diagnostics;
@@ -34,6 +35,8 @@ namespace Ryujinx.UI.Common.Helper
             }
         }
 
+        public static void OpenFolder(FilePath path) => OpenFolder(path.Path);
+
         public static void LocateFile(string path)
         {
             if (File.Exists(path))

src/Ryujinx/Assets/Styles/Themes.xaml

@@ -4,11 +4,10 @@
         <ResourceDictionary x:Key="Default">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
                              Color="{DynamicResource DataGridSelectionColor}" />
+            <Color x:Key="ControlFillColorSecondary">#008AA8</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FFF0F0F0</Color>
             <Color x:Key="ThemeControlBorderColor">#FFd6d6d6</Color>
-            <Color x:Key="TextOnAccentFillColorPrimary">#FFFFFFFF</Color>
-            <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
             <Color x:Key="ThemeForegroundColor">#FF000000</Color>
             <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
             <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
@@ -22,16 +21,19 @@
         <ResourceDictionary x:Key="Light">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
                              Color="{DynamicResource DataGridSelectionColor}" />
+            <Color x:Key="ControlFillColorSecondary">#3ddcff</Color>
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
-            <Color x:Key="ThemeContentBackgroundColor">#FFF0F0F0</Color>
+            <Color x:Key="ThemeContentBackgroundColor">#dedede</Color>
-            <Color x:Key="ThemeControlBorderColor">#FFd6d6d6</Color>
+            <Color x:Key="ThemeControlBorderColor">#c2c2c2</Color>
-            <Color x:Key="TextOnAccentFillColorPrimary">#FFFFFFFF</Color>
-            <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
             <Color x:Key="ThemeForegroundColor">#FF000000</Color>
             <Color x:Key="MenuFlyoutPresenterBorderColor">#C1C1C1</Color>
             <Color x:Key="AppListBackgroundColor">#b3ffffff</Color>
             <Color x:Key="AppListHoverBackgroundColor">#80cccccc</Color>
             <Color x:Key="SecondaryTextColor">#A0000000</Color>
+            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
+            <Color x:Key="Switch">#13c3a4</Color>
+            <Color x:Key="Unbounded">#FFFF4554</Color>
+            <Color x:Key="Custom">#6483F5</Color>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Dark">
             <SolidColorBrush x:Key="DataGridSelectionBackgroundBrush"
@@ -40,13 +42,15 @@
             <Color x:Key="DataGridSelectionColor">#FF00FABB</Color>
             <Color x:Key="ThemeContentBackgroundColor">#FF2D2D2D</Color>
             <Color x:Key="ThemeControlBorderColor">#FF505050</Color>
-            <Color x:Key="TextOnAccentFillColorPrimary">#FFFFFFFF</Color>
-            <Color x:Key="SystemChromeWhiteColor">#FFFFFFFF</Color>
             <Color x:Key="ThemeForegroundColor">#FFFFFFFF</Color>
             <Color x:Key="MenuFlyoutPresenterBorderColor">#3D3D3D</Color>
             <Color x:Key="AppListBackgroundColor">#0FFFFFFF</Color>
             <Color x:Key="AppListHoverBackgroundColor">#1EFFFFFF</Color>
             <Color x:Key="SecondaryTextColor">#A0FFFFFF</Color>
+            <Color x:Key="FavoriteApplicationIconColor">#fffcd12a</Color>
+            <Color x:Key="Switch">#FF2EEAC9</Color>
+            <Color x:Key="Unbounded">#FFFF4554</Color>
+            <Color x:Key="Custom">#6483F5</Color>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 </ResourceDictionary>

src/Ryujinx/Assets/locales.json

@@ -705,7 +705,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "Amiibo 스캔(빈에서)",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -1137,7 +1137,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "자주 묻는 질문(FAQ) 및 문제해결 페이지",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -1161,7 +1161,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "공식 Ryujinx 위키에서 자주 묻는 질문(FAQ) 및 문제 해결 페이지 열기",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -1185,7 +1185,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "설치 및 구성 안내",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -1209,7 +1209,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "공식 Ryujinx 위키에서 설정 및 구성 안내 열기",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -1233,7 +1233,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "멀티플레이어(LDN/LAN) 안내",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -1257,7 +1257,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "공식 Ryujinx 위키에서 멀티플레이어 안내 열기",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -2424,25 +2424,25 @@
     {
       "ID": "StatusBarSystemVersion",
       "Translations": {
-        "ar_SA": "إصدار النظام: {0}",
+        "ar_SA": "",
-        "de_DE": "Systemversion: {0}",
+        "de_DE": "",
-        "el_GR": "Έκδοση Συστήματος: {0}",
+        "el_GR": "",
-        "en_US": "System Version: {0}",
+        "en_US": "Firmware Version: {0}",
-        "es_ES": "Versión del sistema: {0}",
+        "es_ES": "",
         "fr_FR": "Version du Firmware: {0}",
-        "he_IL": "גרסת מערכת: {0}",
+        "he_IL": "",
-        "it_IT": "Versione di sistema: {0}",
+        "it_IT": "",
-        "ja_JP": "システムバージョン: {0}",
+        "ja_JP": "",
-        "ko_KR": "시스템 버전 : {0}",
+        "ko_KR": "",
-        "no_NO": "System versjon: {0}",
+        "no_NO": "",
-        "pl_PL": "Wersja systemu: {0}",
+        "pl_PL": "",
         "pt_BR": "Versão do firmware: {0}",
         "ru_RU": "Версия прошивки: {0}",
-        "th_TH": "เวอร์ชั่นของระบบ: {0}",
+        "th_TH": "",
-        "tr_TR": "Sistem Sürümü: {0}",
+        "tr_TR": "",
-        "uk_UA": "Версія системи: {0}",
+        "uk_UA": "",
         "zh_CN": "系统固件版本：{0}",
-        "zh_TW": "系統版本: {0}"
+        "zh_TW": ""
       }
     },
     {
@@ -3765,6 +3765,30 @@
         "zh_TW": "系統時鐘:"
       }
     },
+    {
+      "ID": "SettingsTabSystemSystemTimeMatch",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Match PC Time",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "SettingsTabSystemEnablePptc",
       "Translations": {
@@ -8049,7 +8073,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "지우기",
+        "ko_KR": "",
         "no_NO": "Tøm",
         "pl_PL": "",
         "pt_BR": "",
@@ -11841,7 +11865,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "{0} : {1}",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -14541,6 +14565,30 @@
         "zh_TW": "變更系統時鐘"
       }
     },
+    {
+      "ID": "MatchTimeTooltip",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Change System Time to match your PC's date & time.",
+        "es_ES": "",
+        "fr_FR": "",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
+      }
+    },
     {
       "ID": "VSyncToggleTooltip",
       "Translations": {
@@ -16125,30 +16173,6 @@
         "zh_TW": "CPU 模式"
       }
     },
-    {
-      "ID": "DialogUpdaterFlatpakNotSupportedMessage",
-      "Translations": {
-        "ar_SA": "الرجاء تحديث ريوجينكس عبر فلات هاب.",
-        "de_DE": "Bitte aktualisiere Ryujinx über FlatHub",
-        "el_GR": "Παρακαλούμε ενημερώστε το Ryujinx μέσω FlatHub.",
-        "en_US": "Please update Ryujinx via FlatHub.",
-        "es_ES": "Por favor, actualiza Ryujinx a través de FlatHub.",
-        "fr_FR": "Merci de mettre à jour Ryujinx via FlatHub.",
-        "he_IL": "בבקשה עדכן את ריוג'ינקס דרך פלאטהב.",
-        "it_IT": "Aggiorna Ryujinx tramite FlatHub.",
-        "ja_JP": "FlatHub を使用して Ryujinx をアップデートしてください.",
-        "ko_KR": "FlatHub를 통해 Ryujinx를 업데이트하세요.",
-        "no_NO": "Vennligst oppdater Ryujinx via FlatHub.",
-        "pl_PL": "Zaktualizuj Ryujinx przez FlatHub.",
-        "pt_BR": "Por favor, atualize o Ryujinx pelo FlatHub.",
-        "ru_RU": "Пожалуйста, обновите Ryujinx через FlatHub.",
-        "th_TH": "โปรดอัปเดต Ryujinx ผ่านช่องทาง FlatHub",
-        "tr_TR": "Lütfen Ryujinx'i FlatHub aracılığıyla güncelleyin.",
-        "uk_UA": "",
-        "zh_CN": "请通过 FlatHub 更新 Ryujinx 模拟器。",
-        "zh_TW": "請透過 Flathub 更新 Ryujinx。"
-      }
-    },
     {
       "ID": "UpdaterDisabledWarningTitle",
       "Translations": {
@@ -18753,7 +18777,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "{0:n0}MB",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -19041,7 +19065,7 @@
         "he_IL": "{0} הרחבות משחק",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "{0} DLC 사용 가능",
         "no_NO": "{0} Nedlastbare innhold(er)",
         "pl_PL": "",
         "pt_BR": "",
@@ -21177,7 +21201,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "수직 동기화 :",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21201,7 +21225,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "사용자 정의 주사율 활성화(실험적)",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21225,7 +21249,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "스위치",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21249,7 +21273,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "무제한",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21273,7 +21297,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "사용자 정의 주사율",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21297,7 +21321,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "에뮬레이트된 수직 동기화. '스위치'는 스위치의 60Hz 주사율을 에뮬레이트합니다. '무한'은 무제한 주사율입니다.",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21321,7 +21345,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "에뮬레이트된 수직 동기화. '스위치'는 스위치의 60Hz 주사율을 에뮬레이트합니다. '무한'은 무제한 주사율입니다. '사용자 지정'은 지정된 사용자 지정 주사율을 에뮬레이트합니다.",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21345,7 +21369,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "사용자가 에뮬레이트된 화면 주사율을 지정할 수 있습니다. 일부 타이틀에서는 게임플레이 로직 속도가 빨라지거나 느려질 수 있습니다. 다른 타이틀에서는 주사율의 배수로 FPS를 제한하거나 예측할 수 없는 동작으로 이어질 수 있습니다. 이는 실험적 기능으로 게임 플레이에 어떤 영향을 미칠지 보장할 수 없습니다. \n\n모르면 끔으로 두세요.",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21369,7 +21393,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "사용자 정의 주사율 목표 값입니다.",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21393,7 +21417,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "일반 스위치 주사율의 백분율로 나타낸 사용자 지정 주사율입니다.",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21417,7 +21441,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "사용자 정의 주사율 % :",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21441,7 +21465,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "사용자 정의 주사율 값 :",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21465,7 +21489,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "간격",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21489,7 +21513,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "수직 동기화 모드 전환 :",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21513,7 +21537,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "사용자 정의 주사율 증가",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21537,7 +21561,7 @@
         "he_IL": "",
         "it_IT": "",
         "ja_JP": "",
-        "ko_KR": "",
+        "ko_KR": "사용자 정의 주사율 감소",
         "no_NO": "",
         "pl_PL": "",
         "pt_BR": "",
@@ -21550,4 +21574,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/Common/LocaleManager.cs

@@ -1,3 +1,4 @@
+using Gommon;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common;
 using Ryujinx.Common.Logging;
@@ -7,12 +8,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Linq;
-using System.Text.Encodings.Web;
-using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Text.Unicode;
 
 namespace Ryujinx.Ava.Common.Locale
 {
@@ -147,39 +143,33 @@ namespace Ryujinx.Ava.Common.Locale
             LocaleChanged?.Invoke();
         }
 
+        #nullable enable
+
+        private static LocalesJson? _localeData;
+        
+        #nullable disable
+
         private static Dictionary<LocaleKeys, string> LoadJsonLanguage(string languageCode)
         {
             var localeStrings = new Dictionary<LocaleKeys, string>();
-            string fileData = EmbeddedResources.ReadAllText($"Ryujinx/Assets/locales.json");
 
-            if (fileData == null)
+            _localeData ??= EmbeddedResources.ReadAllText("Ryujinx/Assets/locales.json")
+                .Into(it => JsonHelper.Deserialize(it, LocalesJsonContext.Default.LocalesJson));
+
+            foreach (LocalesEntry locale in _localeData.Value.Locales)
             {
-                // We were unable to find file for that language code.
+                if (locale.Translations.Count != _localeData.Value.Languages.Count)
-                return null;
-            }
-
-            LocalesJson json = JsonHelper.Deserialize(fileData, LocalesJsonContext.Default.LocalesJson);
-
-            foreach (LocalesEntry locale in json.Locales)
-            {
-                if (locale.Translations.Count != json.Languages.Count)
                 {
-                    Logger.Error?.Print(LogClass.UI, $"Locale key {{{locale.ID}}} is missing languages!");
+                    throw new Exception($"Locale key {{{locale.ID}}} is missing languages! Has {locale.Translations.Count} translations, expected {_localeData.Value.Languages.Count}!");
-                    throw new Exception("Missing locale data!");
                 }
 
-                if (Enum.TryParse<LocaleKeys>(locale.ID, out var localeKey))
+                if (!Enum.TryParse<LocaleKeys>(locale.ID, out var localeKey))
-                {
+                    continue;
-                    if (locale.Translations.TryGetValue(languageCode, out string val) && val != "")
+
-                    {
+                localeStrings[localeKey] =
-                        localeStrings[localeKey] = val;
+                    locale.Translations.TryGetValue(languageCode, out string val) && val != string.Empty
-                    }
+                        ? val
-                    else
+                        : locale.Translations[DefaultLanguageCode];
-                    {
-                        locale.Translations.TryGetValue("en_US", out val);
-                        localeStrings[localeKey] = val;
-                    }
-                }
             }
 
             return localeStrings;
@@ -200,5 +190,5 @@ namespace Ryujinx.Ava.Common.Locale
 
     [JsonSourceGenerationOptions(WriteIndented = true)]
     [JsonSerializable(typeof(LocalesJson))]
-    internal partial class LocalesJsonContext : JsonSerializerContext { }
+    internal partial class LocalesJsonContext : JsonSerializerContext;
 }

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -17,7 +17,6 @@
     <MenuItem
         Click="CreateApplicationShortcut_Click"
         Header="{ext:Locale GameListContextMenuCreateShortcut}"
-        IsEnabled="{Binding CreateShortcutEnabled}"
         Icon="{ext:Icon fa-solid fa-bookmark}"
         ToolTip.Tip="{OnPlatform Default={ext:Locale GameListContextMenuCreateShortcutToolTip}, macOS={ext:Locale GameListContextMenuCreateShortcutToolTipMacOS}}" />
     <Separator />

src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs

@@ -334,7 +334,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
         }
 
-        public bool CanScanAmiiboBinaries => AmiiboBinReader.HasKeyRetailBinPath;
+        public bool CanScanAmiiboBinaries => AmiiboBinReader.HasAmiiboKeyFile;
         
         public bool ShowLoadProgress
         {
@@ -424,8 +424,6 @@ namespace Ryujinx.Ava.UI.ViewModels
 
         public bool OpenBcatSaveDirectoryEnabled => !SelectedApplication.ControlHolder.ByteSpan.IsZeros() && SelectedApplication.ControlHolder.Value.BcatDeliveryCacheStorageSize > 0;
 
-        public bool CreateShortcutEnabled => !ReleaseInformation.IsFlatHubBuild;
-
         public string LoadHeading
         {
             get => _loadHeading;
@@ -2015,7 +2013,7 @@ namespace Ryujinx.Ava.UI.ViewModels
             }
             else
             {
-                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.StatusBarSystemVersion, "0.0");
+                LocaleManager.Instance.UpdateAndGetDynamicValue(LocaleKeys.StatusBarSystemVersion, "NaN");
             }
 
             IsAppletMenuActive = hasApplet;

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -330,6 +330,7 @@ namespace Ryujinx.Ava.UI.ViewModels
         }
 
         public DateTimeOffset CurrentDate { get; set; }
+
         public TimeSpan CurrentTime { get; set; }
 
         internal AvaloniaList<TimeZone> TimeZones { get; set; }
@@ -453,6 +454,18 @@ namespace Ryujinx.Ava.UI.ViewModels
             Dispatcher.UIThread.Post(() => OnPropertyChanged(nameof(PreferredGpuIndex)));
         }
 
+        public void MatchSystemTime()
+        {
+            var dto = DateTimeOffset.Now;
+
+            CurrentDate = new DateTimeOffset(dto.Year, dto.Month, dto.Day, 0, 0, 0, dto.Offset);
+            
+            CurrentTime = dto.TimeOfDay;
+            
+            OnPropertyChanged(nameof(CurrentDate));
+            OnPropertyChanged(nameof(CurrentTime));
+        }
+
         public async Task LoadTimeZones()
         {
             _timeZoneContentManager = new TimeZoneContentManager();

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

@@ -178,7 +178,7 @@ namespace Ryujinx.Ava.UI.Views.Main
         private void ScanBinAmiiboMenuItem_AttachedToVisualTree(object sender, VisualTreeAttachmentEventArgs e)
         {
             if (sender is MenuItem)
-                ViewModel.IsAmiiboBinRequested = ViewModel.IsAmiiboRequested && AmiiboBinReader.HasKeyRetailBinPath;
+                ViewModel.IsAmiiboBinRequested = ViewModel.IsAmiiboRequested && AmiiboBinReader.HasAmiiboKeyFile;
         }
 
         private async void InstallFileTypes_Click(object sender, RoutedEventArgs e)

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml

@@ -182,7 +182,20 @@
                             Width="350"
                             ToolTip.Tip="{ext:Locale TimeTooltip}" />
                     </StackPanel>
-                    <StackPanel Margin="0,0,0,10"
+                    <StackPanel
+                        Margin="350,0,0,10"
+                        Orientation="Horizontal">
+                        <Button
+                            VerticalAlignment="Center"
+                            Click="MatchSystemTime_OnClick"
+                            Background="{DynamicResource SystemAccentColor}"
+                            Width="150"
+                            ToolTip.Tip="{ext:Locale MatchTimeTooltip}">
+                            <TextBlock Text="{ext:Locale SettingsTabSystemSystemTimeMatch}" />
+                        </Button>
+                    </StackPanel>
+                    <Separator />
+                    <StackPanel Margin="0,10,0,10"
                                 Orientation="Horizontal">
                         <TextBlock
                             VerticalAlignment="Center"

src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml.cs

@@ -1,5 +1,7 @@
 using Avalonia.Controls;
+using Avalonia.Interactivity;
 using Ryujinx.Ava.UI.ViewModels;
+using System;
 using TimeZone = Ryujinx.Ava.UI.Models.TimeZone;
 
 namespace Ryujinx.Ava.UI.Views.Settings
@@ -33,5 +35,7 @@ namespace Ryujinx.Ava.UI.Views.Settings
                 ViewModel.ValidateAndSetTimeZone(timeZone.Location);
             }
         }
+
+        private void MatchSystemTime_OnClick(object sender, RoutedEventArgs e) => ViewModel.MatchSystemTime();
     }
 }

src/Ryujinx/Updater.cs

@@ -686,22 +686,11 @@ namespace Ryujinx.Ava
 #else
             if (showWarnings)
             {
-                if (ReleaseInformation.IsFlatHubBuild)
+                Dispatcher.UIThread.InvokeAsync(() =>
-                {
+                    ContentDialogHelper.CreateWarningDialog(
-                    Dispatcher.UIThread.InvokeAsync(() =>
+                        LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
-                        ContentDialogHelper.CreateWarningDialog(
+                        LocaleManager.Instance[LocaleKeys.DialogUpdaterDirtyBuildSubMessage])
-                            LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterFlatpakNotSupportedMessage])
                     );
-                }
-                else
-                {
-                    Dispatcher.UIThread.InvokeAsync(() =>
-                        ContentDialogHelper.CreateWarningDialog(
-                            LocaleManager.Instance[LocaleKeys.UpdaterDisabledWarningTitle],
-                            LocaleManager.Instance[LocaleKeys.DialogUpdaterDirtyBuildSubMessage])
-                    );
-                }
             }
 
             return false;