From e20cd162aadd2a60cec0d692c0ccf4f6352ff037 Mon Sep 17 00:00:00 2001
From: sorgelig <pour.garbage@gmail.com>
Date: Mon, 24 May 2021 01:25:01 +0800
Subject: [PATCH] menu: fix OSD navigation bug.

---
 menu.cpp | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/menu.cpp b/menu.cpp
index 58028e6..5178ea1 100644
--- a/menu.cpp
+++ b/menu.cpp
@@ -1894,11 +1894,12 @@ void HandleUI(void)
 		{
 			menustate = MENU_NONE1;
 		}
-		else if(back)
+		else if(back || (left && page) || (menusub == menusub_last && select))
 		{
 			if(!page) menustate = MENU_NONE1;
 			else
 			{
+				firstmenu = 0;
 				menustate = MENU_GENERIC_MAIN1;
 				menusub = menusub_parent;
 				page = 0;
@@ -1906,17 +1907,7 @@ void HandleUI(void)
 		}
 		else if (select || recent || minus || plus)
 		{
-			if (menusub == menusub_last && select)
-			{
-				if (!page) menustate = MENU_NONE1;
-				else
-				{
-					menustate = MENU_GENERIC_MAIN1;
-					menusub = menusub_parent;
-					page = 0;
-				}
-			}
-			else if (dip_submenu == menusub && select)
+			if (dip_submenu == menusub && select)
 			{
 				menustate = MENU_ARCADE_DIP1;
 				menusub = 0;
@@ -2183,18 +2174,8 @@ void HandleUI(void)
 		}
 		else if (left)
 		{
-			if (page)
-			{
-				firstmenu = 0;
-				menustate = MENU_GENERIC_MAIN1;
-				menusub = menusub_parent;
-				page = 0;
-			}
-			else
-			{
-				menustate = MENU_MISC1;
-				menusub = 3;
-			}
+			menustate = MENU_MISC1;
+			menusub = 3;
 		}
 		else if(spi_uio_cmd16(UIO_GET_OSDMASK, 0) != hdmask)
 		{