misc: some cleanups and fix compile warnings

Ryubing · Jan 1, 2025 · 88d11d3 · 88d11d3
1 parent 391f57b
commit 88d11d3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 11 deletions.
diff --git a/src/Ryujinx/Headless/HeadlessRyujinx.cs b/src/Ryujinx/Headless/HeadlessRyujinx.cs
@@ -52,7 +52,7 @@ public static void Entrypoint(string[] args)
             // Make process DPI aware for proper window sizing on high-res screens.
             ForceDpiAware.Windows();
 
-            Console.Title = $"Ryujinx Console {Program.Version} (Headless)";
+            Console.Title = $"HeadlessRyujinx Console {Program.Version}";
 
             if (OperatingSystem.IsMacOS() || OperatingSystem.IsLinux())
             {

diff --git a/src/Ryujinx/Headless/Options.cs b/src/Ryujinx/Headless/Options.cs
@@ -171,13 +171,11 @@ public void InheritMainConfigInput(string[] originalArgs, ConfigurationState con
                 { PlayerIndex.Player8, (nameof(InputId8), nameof(InputProfile8Name)) }
             };
 
-            foreach ((PlayerIndex playerIndex, (string id, string profile)) in indicesToProperties)
+            foreach ((PlayerIndex playerIndex, _) in indicesToProperties
+                         .Where(it => NeedsOverride(it.Value.InputId) && NeedsOverride(it.Value.InputProfileName)))
             {
-                if (NeedsOverride(id) && NeedsOverride(profile))
-                {
-                    configurationState.Hid.InputConfig.Value.FindFirst(x => x.PlayerIndex == playerIndex)
-                        .IfPresent(ic => InheritedInputConfigs[playerIndex] = ic);
-                }
+                configurationState.Hid.InputConfig.Value.FindFirst(x => x.PlayerIndex == playerIndex)
+                    .IfPresent(ic => InheritedInputConfigs[playerIndex] = ic);
             }
 
             return;

diff --git a/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs b/src/Ryujinx/UI/ViewModels/DownloadableContentManagerViewModel.cs
@@ -106,9 +106,9 @@ public void Sort()
             // NOTE(jpr): this works around a bug where calling _views.Clear also clears SelectedDownloadableContents for
             // some reason. so we save the items here and add them back after
             var items = SelectedDownloadableContents.ToArray();
-
-            _views.Clear();
-            _views.AddRange(view);
+            
+            Views.Clear();
+            Views.AddRange(view);
 
             foreach (DownloadableContentModel item in items)
             {

diff --git a/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/MainWindowViewModel.cs
@@ -182,7 +182,11 @@ public MainWindowViewModel()
             Applications.ToObservableChangeSet()
                 .Filter(Filter)
                 .Sort(GetComparer())
+                .OnItemAdded(_ => OnPropertyChanged(nameof(AppsObservableList)))
+                .OnItemRemoved(_ => OnPropertyChanged(nameof(AppsObservableList)))
+#pragma warning disable MVVMTK0034 // Event to update is fired below
                 .Bind(out _appsObservableList)
+#pragma warning restore MVVMTK0034
                 .AsObservableList();
 
             _rendererWaitEvent = new AutoResetEvent(false);
@@ -192,8 +196,8 @@ public MainWindowViewModel()
                 LoadConfigurableHotKeys();
 
                 Volume = ConfigurationState.Instance.System.AudioVolume;
+                CustomVSyncInterval = ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value;
             }
-            CustomVSyncInterval = ConfigurationState.Instance.Graphics.CustomVSyncInterval.Value;
         }
 
         public void Initialize(