Merge bcbe589964 into 6b55d158b7

src/ARMeilleure/Translation/Cache/JitCache.cs

@@ -186,7 +186,7 @@ namespace ARMeilleure.Translation.Cache
             
             int newRegionNumber = _activeRegionIndex;
 
-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((long)(newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
+            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
         
             _cacheAllocator = new CacheMemoryAllocator(CacheSize);
 

src/Ryujinx.Cpu/LightningJit/Cache/JitCache.cs

@@ -166,7 +166,7 @@ namespace Ryujinx.Cpu.LightningJit.Cache
             
             int newRegionNumber = _activeRegionIndex;
 
-            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((long)(newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
+            Logger.Warning?.Print(LogClass.Cpu, $"JIT Cache Region {exhaustedRegion} exhausted, creating new Cache Region {newRegionNumber} ({((newRegionNumber + 1) * CacheSize).Bytes()} Total Allocation).");
         
             _cacheAllocator = new CacheMemoryAllocator(CacheSize);
 

src/Ryujinx.HLE/HOS/Services/Ldn/UserServiceCreator/LdnRyu/Proxy/P2pProxyServer.cs

@@ -110,24 +110,10 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
             _broadcastAddress = config.ProxyIp | (~config.ProxySubnetMask);
         }
 
-        public async Task<ushort> NatPunch()
+        private async Task<ushort> NatPunchForDevice(NatDevice device)
         {
-            NatDiscoverer discoverer = new();
-            CancellationTokenSource cts = new(5000);
-
-            NatDevice device;
-
-            try
-            {
-                device = await discoverer.DiscoverDeviceAsync(PortMapper.Upnp, cts);
-            }
-            catch (NatDeviceNotFoundException)
-            {
-                return 0;
-            }
-
+            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Attempting to map port using {device.ToString()}");
             _publicPort = PublicPortBase;
-
             for (int i = 0; i < PublicPortRange; i++)
             {
                 try
@@ -138,12 +124,14 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
 
                     break;
                 }
-                catch (MappingException)
+                catch (MappingException ex)
                 {
+                    Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Failed to map port {_publicPort}: {ex.Message}");
                     _publicPort++;
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
+                    Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Failed to map port {_publicPort}: {ex.GetType().Name}: {ex.Message}");
                     return 0;
                 }
 
@@ -155,17 +143,52 @@ namespace Ryujinx.HLE.HOS.Services.Ldn.UserServiceCreator.LdnRyu.Proxy
 
             if (_publicPort != 0)
             {
+                _natDevice = device;
                 _ = Executor.ExecuteAfterDelayAsync(
-                    PortLeaseRenew.Seconds(), 
+                    PortLeaseRenew.Seconds(),
                     _disposedCancellation.Token,
                     RefreshLease);
             }
 
-            _natDevice = device;
-
             return _publicPort;
         }
 
+        public async Task<ushort> NatPunch()
+        {
+            NatDiscoverer discoverer = new();
+            CancellationTokenSource cts = new(500);
+
+            NatDevice[] devices;
+
+            try
+            {
+                devices = (await discoverer.DiscoverDevicesAsync(PortMapper.Upnp, cts)).ToArray();
+            }
+            catch (Exception ex)
+            {
+                Logger.Error?.PrintMsg(LogClass.ServiceLdn, $"Failed to discover UPnP devices: {ex.Message}");
+                return 0;
+            }
+
+            if (devices.Length == 0)
+            {
+                Logger.Error?.PrintMsg(LogClass.ServiceLdn, "No UPnP devices found.");
+                return 0;
+            }
+
+            foreach (var device in devices)
+            {
+                ushort port = await NatPunchForDevice(device);
+                if (port != 0)
+                {
+                    return port;
+                }
+            }
+            Logger.Info?.PrintMsg(LogClass.ServiceLdn, $"Failed to map port using any device");
+            _publicPort = 0;
+            return 0;
+        }
+
         // Proxy handlers
 
         private void RouteMessage(P2pProxySession sender, ref ProxyInfo info, Action<P2pProxySession> action)

src/Ryujinx/Assets/locales.json

@@ -4621,7 +4621,7 @@
         "zh_CN": "繁体中文（推荐）",
         "zh_TW": "正體中文 (建議)"
       }
-    },
+    },    
     {
       "ID": "SettingsTabSystemSystemLanguageSwedish",
       "Translations": {
@@ -4646,7 +4646,7 @@
         "zh_CN": "瑞典语",
         "zh_TW": ""
       }
-    },
+    },    
     {
       "ID": "SettingsTabSystemSystemLanguageNorwegian",
       "Translations": {
@@ -24073,4 +24073,4 @@
       }
     }
   ]
-}
+}

src/Ryujinx/UI/ViewModels/SettingsViewModel.cs

@@ -49,7 +49,8 @@ namespace Ryujinx.Ava.UI.ViewModels
         private int _graphicsBackendMultithreadingIndex;
         private float _volume;
         [ObservableProperty] private bool _isVulkanAvailable = true;
-        [ObservableProperty] private bool _gameListNeedsRefresh;
+        [ObservableProperty] private bool _gameDirectoryChanged;
+        [ObservableProperty] private bool _autoloadDirectoryChanged;
         private readonly List<string> _gpuIds = [];
         private int _graphicsBackendIndex;
         private int _scalingFilter;
@@ -592,8 +593,16 @@ namespace Ryujinx.Ava.UI.ViewModels
             config.HideCursor.Value = (HideCursorMode)HideCursor;
             config.UpdateCheckerType.Value = (UpdaterType)UpdateCheckerType;
             config.FocusLostActionType.Value = (FocusLostType)FocusLostActionType;
-            config.UI.GameDirs.Value = [..GameDirectories];
-            config.UI.AutoloadDirs.Value = [..AutoloadDirectories];
+
+            if (GameDirectoryChanged)
+            {
+                config.UI.GameDirs.Value = [..GameDirectories];
+            }
+
+            if (AutoloadDirectoryChanged)
+            {
+                config.UI.AutoloadDirs.Value = [..AutoloadDirectories];
+            }
 
             config.UI.BaseStyle.Value = BaseStyleIndex switch
             {
@@ -614,11 +623,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             // System
             config.System.Region.Value = (Region)Region;
-            
-            if (config.System.Language.Value != (Language)Language)
-                GameListNeedsRefresh = true;
-            
             config.System.Language.Value = (Language)Language;
+
             if (_validTzRegions.Contains(TimeZone))
             {
                 config.System.TimeZone.Value = TimeZone;
@@ -709,7 +715,8 @@ namespace Ryujinx.Ava.UI.ViewModels
 
             SaveSettingsEvent?.Invoke();
 
-            GameListNeedsRefresh = false;
+            GameDirectoryChanged = false;
+            AutoloadDirectoryChanged = false;
         }
 
         private static void RevertIfNotSaved()

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

@@ -36,8 +36,11 @@ namespace Ryujinx.Ava.UI.Views.Settings
                 directories.Add(path);
                 
                 addDirBox.Clear();
-
-                ViewModel.GameListNeedsRefresh = true;
+                
+                if (isGameList)
+                    ViewModel.GameDirectoryChanged = true;
+                else
+                    ViewModel.AutoloadDirectoryChanged = true;
             }
             else
             {
@@ -47,7 +50,10 @@ namespace Ryujinx.Ava.UI.Views.Settings
                 {
                     directories.Add(folder.Value.Path.LocalPath);
                         
-                    ViewModel.GameListNeedsRefresh = true;
+                    if (isGameList)
+                        ViewModel.GameDirectoryChanged = true;
+                    else
+                        ViewModel.AutoloadDirectoryChanged = true;
                 }
             }
         }
@@ -59,7 +65,7 @@ namespace Ryujinx.Ava.UI.Views.Settings
             foreach (string path in new List<string>(GameDirsList.SelectedItems.Cast<string>()))
             {
                 ViewModel.GameDirectories.Remove(path);
-                ViewModel.GameListNeedsRefresh = true;
+                ViewModel.GameDirectoryChanged = true;
             }
 
             if (GameDirsList.ItemCount > 0)
@@ -75,7 +81,7 @@ namespace Ryujinx.Ava.UI.Views.Settings
             foreach (string path in new List<string>(AutoloadDirsList.SelectedItems.Cast<string>()))
             {
                 ViewModel.AutoloadDirectories.Remove(path);
-                ViewModel.GameListNeedsRefresh = true;
+                ViewModel.AutoloadDirectoryChanged = true;
             }
 
             if (AutoloadDirsList.ItemCount > 0)

src/Ryujinx/UI/Windows/SettingsWindow.axaml.cs

@@ -45,7 +45,7 @@ namespace Ryujinx.Ava.UI.Windows
         {
             InputPage.InputView?.SaveCurrentProfile();
 
-            if (Owner is MainWindow window && ViewModel.GameListNeedsRefresh)
+            if (Owner is MainWindow window && (ViewModel.GameDirectoryChanged || ViewModel.AutoloadDirectoryChanged))
             {
                 window.LoadApplications();
             }

src/Ryujinx/Utilities/Configuration/ConfigurationState.Migration.cs

@@ -88,7 +88,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
             System.Region.Value = cff.SystemRegion;
             System.TimeZone.Value = cff.SystemTimeZone;
             System.SystemTimeOffset.Value = cff.SystemTimeOffset;
-            System.MatchSystemTime.Value = cff.MatchSystemTime;
             System.EnableDockedMode.Value = cff.DockedMode;
             System.EnablePtc.Value = cff.EnablePtc;
             System.EnableLowPowerPtc.Value = cff.EnableLowPowerPtc;

src/Ryujinx/Utilities/Configuration/ConfigurationState.cs

@@ -53,7 +53,6 @@ namespace Ryujinx.Ava.Utilities.Configuration
                 SystemRegion = System.Region,
                 SystemTimeZone = System.TimeZone,
                 SystemTimeOffset = System.SystemTimeOffset,
-                MatchSystemTime = System.MatchSystemTime,
                 DockedMode = System.EnableDockedMode,
                 EnableDiscordIntegration = EnableDiscordIntegration,
                 CheckUpdatesOnStart = CheckUpdatesOnStart,