From 19095c25ebf70bcf6b312d41472a2c8cfa190652 Mon Sep 17 00:00:00 2001
From: Gyorgy Szombathelyi <8644936+gyurco@users.noreply.github.com>
Date: Sun, 29 Oct 2023 01:28:07 +0200
Subject: [PATCH] menu: fix page up/page dn when the last/first option is
 invisible

---
 menu.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/menu.c b/menu.c
index 8b716ab..9ab48be 100644
--- a/menu.c
+++ b/menu.c
@@ -1301,9 +1301,15 @@ void HandleUI(void)
 
 			if (c == KEY_PGDN) {
 				if (menusub < (osdlines - 1 - (menu_page.stdexit?1:0))) {
+					unsigned char save_menusub = menusub;
 					menusub = osdlines - 1 - (menu_page.stdexit?1:0);
 					while((menumask & (1<<menusub)) == 0) menusub--;
-					menustate = parentstate;
+					if (menusub == save_menusub) {
+						// at the last active line, try to scroll down
+						scroll_down = osdlines - (menu_page.stdexit?1:0);
+					} else {
+						menustate = parentstate;
+					}
 				} else {
 					scroll_down = osdlines - (menu_page.stdexit?1:0);
 				}
@@ -1330,10 +1336,16 @@ void HandleUI(void)
 
 			if (c == KEY_PGUP) {
 				if (menusub > firstline) {
+					unsigned char save_menusub = menusub;
 					menusub = firstline;
 					while((menumask & (1<<menusub)) == 0 && menusub<osdlines) menusub++;
 					if(menusub == osdlines) menusub = firstline;
-					menustate = parentstate;
+					if (menusub == save_menusub) {
+						// at the first active line, try to scroll up
+						scroll_up = osdlines - (menu_page.stdexit?1:0);
+					} else {
+						menustate = parentstate;
+					}
 				} else {
 					scroll_up = osdlines - firstline - (menu_page.stdexit?1:0);
 				}