From 359852b5c0bc6d0abcd686615469e2000d349728 Mon Sep 17 00:00:00 2001
From: Evan Husted <greem@greemdev.net>
Date: Thu, 30 Jan 2025 16:47:40 -0600
Subject: [PATCH] UI: Change order of VSync mode changing

VSync -> VSync Off -> Custom
is now
VSync -> Custom -> VSync Off

Note that Custom only appears if it's enabled in settings. This has no change if you aren't using custom VSync.
---
 src/Ryujinx/AppHost.cs                           | 14 ++++----------
 src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs |  2 --
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/Ryujinx/AppHost.cs b/src/Ryujinx/AppHost.cs
index b85b17b89..15e371ca4 100644
--- a/src/Ryujinx/AppHost.cs
+++ b/src/Ryujinx/AppHost.cs
@@ -325,21 +325,15 @@ namespace Ryujinx.Ava
             switch (oldVSyncMode)
             {
                 case VSyncMode.Switch:
-                    newVSyncMode = VSyncMode.Unbounded;
+                    newVSyncMode = customVSyncIntervalEnabled 
+                        ? VSyncMode.Custom 
+                        : VSyncMode.Unbounded;
                     break;
                 case VSyncMode.Unbounded:
-                    if (customVSyncIntervalEnabled)
-                    {
-                        newVSyncMode = VSyncMode.Custom;
-                    }
-                    else
-                    {
                         newVSyncMode = VSyncMode.Switch;
-                    }
-
                     break;
                 case VSyncMode.Custom:
-                    newVSyncMode = VSyncMode.Switch;
+                    newVSyncMode = VSyncMode.Unbounded;
                     break;
             }
 
diff --git a/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs b/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs
index 2fbb40ff2..ce28f6c1c 100644
--- a/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs
+++ b/src/Ryujinx/UI/Views/Input/LedInputView.axaml.cs
@@ -1,11 +1,9 @@
 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