Add loop break and error handling

Dn-Programming-Core-Management · Jan 9, 2025 · 4de0240 · 4de0240
1 parent 9b0c9de
commit 4de0240
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/Source/FamiTracker.cpp b/Source/FamiTracker.cpp
@@ -455,19 +455,20 @@ void CFamiTrackerApp::OnRecentFilesClear()		// // //
 	auto pFilesMenu = m_pMainWnd->GetMenu()->GetSubMenu(0);
 
 	// Try and find Recent Files submenu
-	for (int nPos = pFilesMenu->GetMenuItemCount(); nPos > 0; --nPos) {
-		UINT Status = pFilesMenu->GetMenuState(nPos, MF_BYPOSITION);
+	for (int nPos = 0; nPos < pFilesMenu->GetMenuItemCount(); nPos++)
 		// check if valid menu state
-		if (Status != UINT(-1)) {
+		if (pFilesMenu->GetMenuState(nPos, MF_BYPOSITION) != UINT(-1)) {
 			// check if it has a submenu and the first item is ID_RECENTFILES_CLEAR
 			auto pSubMenu = pFilesMenu->GetSubMenu(nPos);
 			if (pSubMenu != nullptr && pSubMenu->GetMenuItemID(0) == ID_RECENTFILES_CLEAR) {
 				for (int i = 0; i < MAX_RECENT_FILES; ++i)
 					pSubMenu->RemoveMenu(ID_FILE_MRU_FILE1 + i, MF_BYCOMMAND);
 				pSubMenu->AppendMenu(MF_STRING, ID_FILE_MRU_FILE1, _T("(File)"));
+				return;
 			}
 		}
-	}
+
+	throw std::runtime_error("Could not find \"ID_RECENTFILES_CLEAR\"");
 }
 
 void CFamiTrackerApp::OnUpdateRecentFiles(CCmdUI *pCmdUI)		// // //