Backing out Bookmarks top-level menu change. I have no idea what went wrong.

cmd/winfe/genframe.cpp

@@ -2631,8 +2631,16 @@ int CGenericFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 			}
 	#endif
 
+
 			// Replace the bookmark menu with a new menu that can have ON_DRAWITEM overridden
-			CMenu *pOldBookmarksMenu = pMenu->GetSubMenu(nWindowPosition-1);
+			//BookMark is the First Popup in the Communicator Menu so loop through to find it.
+			UINT nBookmarksPosition = 0;
+			while(!pWindowMenu->GetSubMenu(nBookmarksPosition) && nBookmarksPosition < pWindowMenu->GetMenuItemCount())
+				nBookmarksPosition++;
+
+			if(nBookmarksPosition < pWindowMenu->GetMenuItemCount())
+			{
+				CMenu *pOldBookmarksMenu = pWindowMenu->GetSubMenu(nBookmarksPosition);
 				char bookmarksStr[30];
 
 				if(pOldBookmarksMenu)
@@ -2644,9 +2652,9 @@ int CGenericFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 					m_OriginalBookmarksGarbageList = new CTreeItemList;
 
 					CopyMenu(pOldBookmarksMenu, m_pBookmarksMenu, m_OriginalBookmarksGarbageList);
-				pMenu->GetMenuString(nWindowPosition-1, bookmarksStr, 30, MF_BYPOSITION);
-				pMenu->DeleteMenu(nWindowPosition-1, MF_BYPOSITION);
-				pMenu->InsertMenu(nWindowPosition-1, MF_BYPOSITION|MF_STRING|MF_POPUP, (UINT)m_pBookmarksMenu->GetSafeHmenu(), bookmarksStr);
+					pWindowMenu->GetMenuString(nBookmarksPosition, bookmarksStr, 30, MF_BYPOSITION);
+					pWindowMenu->DeleteMenu(nBookmarksPosition, MF_BYPOSITION);
+					pWindowMenu->InsertMenu(nBookmarksPosition, MF_BYPOSITION|MF_STRING|MF_POPUP, (UINT)m_pBookmarksMenu->GetSafeHmenu(), bookmarksStr);
 
 					//FileBookmark is the First Popup in the BookMarks Menu so loop through to find it.
 					UINT nfileBookmarksPosition = 0;
@@ -2658,6 +2666,7 @@ int CGenericFrame::OnCreate(LPCREATESTRUCT lpCreateStruct)
 				}
 			}
 		}
+	}
 
 #ifdef MOZ_TASKBAR
 	// We use a taskbar