Select next active option if previous one no longer is

Quake/menu.c

@@ -3397,6 +3397,7 @@ static qboolean M_Options_IsSelectable (int index)
 	index += optionsmenu.first_item;
 	return
 		(unsigned int) index < countof (options_names) &&
+		(unsigned int) index < (unsigned int)optionsmenu.list.numitems &&
 		options_names[index][0] != '\0'
 	;
 }
@@ -3461,6 +3462,10 @@ void M_Options_Init (enum m_state_e state)
 
 	M_List_ClearSearch (&optionsmenu.list);
 
+	// If the cursor is on an inactive item, move it to the next active one
+	if (!M_Options_IsSelectable (optionsmenu.list.cursor))
+		M_List_SelectNextActive (&optionsmenu.list, optionsmenu.list.cursor, 1, true);
+
 	M_Options_UpdateLayout ();
 }