Patched: CMenus improperly setting the following number binds.

WhyIsEvery4thYearAlwaysBad · WhyIsEvery4thYearAlwaysBad · commit 53563b99f6cd · 2021-05-08T20:17:57.000-05:00
diff --git a/src/compiler.cpp b/src/compiler.cpp
@@ -340,6 +340,7 @@ bool ParseMenuTokens(unsigned short& p_iBindCount, unsigned char& p_bUsedDisplay
 							else (CMenuStack.begin()+1)->binds.push_back(Bind(std::to_string(NumKeyStack.top() % 10),Parser::BindToken(CurrentCMenu.sName,"exec $cmenu_"+formatRaw(CurrentCMenu.sName),CurrentCMenu.fAttribs)));
 						}
 					}
+					if (!(CurrentCMenu.fAttribs & CMTOKATTRIB_BIND_KEYSET) && !NumKeyStack.empty()) NumKeyStack.top()=(NumKeyStack.top()+1);
 					NumKeyStack.push(1u);
 				}
 				break;
@@ -351,7 +352,6 @@ bool ParseMenuTokens(unsigned short& p_iBindCount, unsigned char& p_bUsedDisplay
 				CMenuStack.pop_front();
 				assert(!NumKeyStack.empty());
 				NumKeyStack.pop();
-				if (!(CurrentCMenu.fAttribs & CMTOKATTRIB_BIND_KEYSET) && !NumKeyStack.empty()) NumKeyStack.top()=(NumKeyStack.top()+1);
 			break;
 			case Parser::CMenuTokenType::MENU_BIND:
 			{

Original file line number	Diff line number	Diff line change
`@@ -340,6 +340,7 @@ bool ParseMenuTokens(unsigned short& p_iBindCount, unsigned char& p_bUsedDisplay`
`340`	`340`	`else (CMenuStack.begin()+1)->binds.push_back(Bind(std::to_string(NumKeyStack.top() % 10),Parser::BindToken(CurrentCMenu.sName,"exec $cmenu_"+formatRaw(CurrentCMenu.sName),CurrentCMenu.fAttribs)));`
`341`	`341`	`}`
`342`	`342`	`}`
	`343`	`+ if (!(CurrentCMenu.fAttribs & CMTOKATTRIB_BIND_KEYSET) && !NumKeyStack.empty()) NumKeyStack.top()=(NumKeyStack.top()+1);`
`343`	`344`	`NumKeyStack.push(1u);`
`344`	`345`	`}`
`345`	`346`	`break;`
`@@ -351,7 +352,6 @@ bool ParseMenuTokens(unsigned short& p_iBindCount, unsigned char& p_bUsedDisplay`
`351`	`352`	`CMenuStack.pop_front();`
`352`	`353`	`assert(!NumKeyStack.empty());`
`353`	`354`	`NumKeyStack.pop();`
`354`		`- if (!(CurrentCMenu.fAttribs & CMTOKATTRIB_BIND_KEYSET) && !NumKeyStack.empty()) NumKeyStack.top()=(NumKeyStack.top()+1);`
`355`	`355`	`break;`
`356`	`356`	`case Parser::CMenuTokenType::MENU_BIND:`
`357`	`357`	`{`