Merge branch 'master' into master

swiggybobo

src/Ryujinx.Common/ReleaseInformation.cs

@@ -6,6 +6,7 @@ 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";
 
@@ -28,6 +29,8 @@ 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.HLE/HOS/Kernel/Common/KResourceLimit.cs

@@ -15,8 +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 Lock _lock = new();
 
         private readonly LinkedList<KThread> _waitingThreads;
 

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());
+        public static bool IsTypeAssociationSupported => (OperatingSystem.IsLinux() || OperatingSystem.IsWindows()) && !ReleaseInformation.IsFlatHubBuild;
         
         public static bool AreMimeTypesRegistered
         {

src/Ryujinx/UI/Controls/ApplicationContextMenu.axaml

@@ -17,6 +17,7 @@
     <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

@@ -424,6 +424,8 @@ 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;

src/Ryujinx/Updater.cs

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