Memory menu fix

Zephiles · Zephiles · commit aaf2106cb56b · 2019-04-19T18:35:16.000-05:00
Fixed the current menu option being set incorrectly when not on the first page.
diff --git a/ttyd-tools/rel/source/menu.cpp b/ttyd-tools/rel/source/menu.cpp
@@ -1748,6 +1748,7 @@ void menuCheckButton()
 		}
 		case MEMORY:
 		{
+			uint32_t MaxOptionsPerPage = 9;
 			switch (CurrentButton)
 			{
 				case DPADDOWN:
@@ -1807,7 +1808,7 @@ void menuCheckButton()
 										if (EmptyWatchSlot >= 0)
 										{
 											SelectedOption 		= tempCurrentMenuOption;
-											CurrentMenuOption 	= tempCurrentPage * 10;
+											CurrentMenuOption 	= tempCurrentPage * MaxOptionsPerPage;
 										}
 										else
 										{
@@ -1830,7 +1831,7 @@ void menuCheckButton()
 									if (tempAddress)
 									{
 										SelectedOption 		= tempCurrentMenuOption;
-										CurrentMenuOption 	= tempCurrentPage * 10;
+										CurrentMenuOption 	= tempCurrentPage * MaxOptionsPerPage;
 									}
 									else
 									{
@@ -1846,7 +1847,7 @@ void menuCheckButton()
 									if (tempAddress)
 									{
 										SelectedOption 		= tempCurrentMenuOption;
-										CurrentMenuOption 	= tempCurrentPage * 10;
+										CurrentMenuOption 	= tempCurrentPage * MaxOptionsPerPage;
 									}
 									else
 									{

Original file line number	Diff line number	Diff line change
`@@ -1748,6 +1748,7 @@ void menuCheckButton()`
`1748`	`1748`	`}`
`1749`	`1749`	`case MEMORY:`
`1750`	`1750`	`{`
	`1751`	`+ uint32_t MaxOptionsPerPage = 9;`
`1751`	`1752`	`switch (CurrentButton)`
`1752`	`1753`	`{`
`1753`	`1754`	`case DPADDOWN:`
`@@ -1807,7 +1808,7 @@ void menuCheckButton()`
`1807`	`1808`	`if (EmptyWatchSlot >= 0)`
`1808`	`1809`	`{`
`1809`	`1810`	`SelectedOption = tempCurrentMenuOption;`
`1810`		`- CurrentMenuOption = tempCurrentPage * 10;`
	`1811`	`+ CurrentMenuOption = tempCurrentPage * MaxOptionsPerPage;`
`1811`	`1812`	`}`
`1812`	`1813`	`else`
`1813`	`1814`	`{`
`@@ -1830,7 +1831,7 @@ void menuCheckButton()`
`1830`	`1831`	`if (tempAddress)`
`1831`	`1832`	`{`
`1832`	`1833`	`SelectedOption = tempCurrentMenuOption;`
`1833`		`- CurrentMenuOption = tempCurrentPage * 10;`
	`1834`	`+ CurrentMenuOption = tempCurrentPage * MaxOptionsPerPage;`
`1834`	`1835`	`}`
`1835`	`1836`	`else`
`1836`	`1837`	`{`
`@@ -1846,7 +1847,7 @@ void menuCheckButton()`
`1846`	`1847`	`if (tempAddress)`
`1847`	`1848`	`{`
`1848`	`1849`	`SelectedOption = tempCurrentMenuOption;`
`1849`		`- CurrentMenuOption = tempCurrentPage * 10;`
	`1850`	`+ CurrentMenuOption = tempCurrentPage * MaxOptionsPerPage;`
`1850`	`1851`	`}`
`1851`	`1852`	`else`
`1852`	`1853`	`{`