From 86f5964262455ae62d8984744dca589f82301b43 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Wed, 1 Apr 2020 19:28:22 -0500
Subject: [PATCH] remove wrapping on DS layout hotkeys

---
 BizHawk.Client.EmuHawk/MainForm.Hotkey.cs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
index 4d72596fe1..daf5853e82 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Hotkey.cs
@@ -804,19 +804,16 @@ namespace BizHawk.Client.EmuHawk
 				{
 					num++;
 				}
+
 				var next = (MelonDS.ScreenLayoutKind)Enum.Parse(typeof(MelonDS.ScreenLayoutKind), num.ToString());
-				if (!typeof(MelonDS.ScreenLayoutKind).IsEnumDefined(next))
+				if (typeof(MelonDS.ScreenLayoutKind).IsEnumDefined(next))
 				{
-					next = decrement
-						? Enum.GetValues(typeof(MelonDS.ScreenLayoutKind)).Cast<MelonDS.ScreenLayoutKind>().Last()
-						: default;
+					settings.ScreenLayout = next;
+
+					ds.PutSettings(settings);
+					AddOnScreenMessage($"Screen layout to {next}");
+					FrameBufferResized();
 				}
-
-				settings.ScreenLayout = next;
-
-				ds.PutSettings(settings);
-				AddOnScreenMessage($"Screen layout to {next}");
-				FrameBufferResized();
 			}
 		}