Merge 2d79cc7a8c into 796674d9cf

src/Ryujinx.Common/Configuration/VSyncMode.cs

@@ -6,16 +6,4 @@ namespace Ryujinx.Common.Configuration
         Unbounded,
         Custom
     }
-    
-    public static class VSyncModeExtensions
-    {
-        public static VSyncMode Next(this VSyncMode vsync, bool customEnabled = false) =>
-            vsync switch
-            {
-                VSyncMode.Switch => customEnabled ? VSyncMode.Custom : VSyncMode.Unbounded,
-                VSyncMode.Unbounded => VSyncMode.Switch,
-                VSyncMode.Custom => VSyncMode.Unbounded,
-                _ => VSyncMode.Switch
-            };
-    }
 }

src/Ryujinx/AppHost.cs

@@ -319,12 +319,31 @@ namespace Ryujinx.Ava
         public void VSyncModeToggle()
         {
             VSyncMode oldVSyncMode = Device.VSyncMode;
+            VSyncMode newVSyncMode = VSyncMode.Switch;
             bool customVSyncIntervalEnabled = ConfigurationState.Instance.Graphics.EnableCustomVSyncInterval.Value;
 
-            UpdateVSyncMode(this, new ReactiveEventArgs<VSyncMode>(
-                oldVSyncMode, 
-                oldVSyncMode.Next(customVSyncIntervalEnabled))
-            );
+            switch (oldVSyncMode)
+            {
+                case VSyncMode.Switch:
+                    newVSyncMode = VSyncMode.Unbounded;
+                    break;
+                case VSyncMode.Unbounded:
+                    if (customVSyncIntervalEnabled)
+                    {
+                        newVSyncMode = VSyncMode.Custom;
+                    }
+                    else
+                    {
+                        newVSyncMode = VSyncMode.Switch;
+                    }
+
+                    break;
+                case VSyncMode.Custom:
+                    newVSyncMode = VSyncMode.Switch;
+                    break;
+            }
+
+            UpdateVSyncMode(this, new ReactiveEventArgs<VSyncMode>(oldVSyncMode, newVSyncMode));
         }
 
         private void UpdateCustomVSyncIntervalValue(object sender, ReactiveEventArgs<int> e)

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

@@ -1,9 +1,11 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Markup.Xaml;
 using FluentAvalonia.UI.Controls;
 using Ryujinx.Ava.Common.Locale;
 using Ryujinx.Ava.UI.Models.Input;
 using Ryujinx.Ava.UI.ViewModels.Input;
+using Ryujinx.Ava.UI.Views.Input;
 using System.Threading.Tasks;
 
 namespace Ryujinx.UI.Views.Input