1.1 --- a/extensions/topmenus/TopMenu.cpp	Wed Sep 26 21:44:12 2007 +0000
     1.2 +++ b/extensions/topmenus/TopMenu.cpp	Wed Sep 26 22:37:40 2007 +0000
     1.3 @@ -59,14 +59,13 @@
     1.4  TopMenu::~TopMenu()
     1.5  {
     1.6  	/* Delete all categories */
     1.7 -	size_t i = 1;
     1.8 -	while (i >= m_Categories.size())
     1.9 +	while (m_Categories.size())
    1.10  	{
    1.11 -		RemoveFromMenu(m_Categories[i - 1]->obj->object_id);
    1.12 +		RemoveFromMenu(m_Categories[0]->obj->object_id);
    1.13  	}
    1.14  
    1.15  	/* Remove all objects */
    1.16 -	for (i = 0; i < m_Objects.size(); i++)
    1.17 +	for (size_t i = 0; i < m_Objects.size(); i++)
    1.18  	{
    1.19  		assert(m_Objects[i]->is_free == true);
    1.20  		delete m_Objects[i];
    1.21 @@ -75,13 +74,13 @@
    1.22  	m_pTitle->OnTopMenuObjectRemoved(this, 0);
    1.23  
    1.24  	/* Delete all cached config entries */
    1.25 -	for (i = 0; i < m_Config.cats.size(); i++)
    1.26 +	for (size_t i = 0; i < m_Config.cats.size(); i++)
    1.27  	{
    1.28  		delete m_Config.cats[i];
    1.29  	}
    1.30  
    1.31  	/* Sweep players */
    1.32 -	for (i = 0; i <= (size_t)m_max_clients; i++)
    1.33 +	for (size_t i = 0; i <= (size_t)m_max_clients; i++)
    1.34  	{
    1.35  		TearDownClient(&m_clients[i]);
    1.36  	}
    1.37 @@ -597,7 +596,7 @@
    1.38  		qsort(item_list, m_UnsortedCats.size(), sizeof(obj_by_name_t), _SortObjectNamesDescending);
    1.39  
    1.40  		/* Add the new sorted categories */
    1.41 -		for (size_t i = 0; i < m_SortedCats.size(); i++)
    1.42 +		for (size_t i = 0; i < m_UnsortedCats.size(); i++)
    1.43  		{
    1.44  			if (m_Categories[item_list[i].obj_index]->obj_list.size() == 0)
    1.45  			{

     2.1 --- a/extensions/topmenus/smn_topmenus.cpp	Wed Sep 26 21:44:12 2007 +0000
     2.2 +++ b/extensions/topmenus/smn_topmenus.cpp	Wed Sep 26 22:37:40 2007 +0000
     2.3 @@ -199,7 +199,7 @@
     2.4  		return pContext->ThrowNativeError("Invalid Handle %x (error: %d)", params[1], err);
     2.5  	}
     2.6  
     2.7 -	IPluginFunction *func = pContext->GetFunctionById(params[1]);
     2.8 +	IPluginFunction *func = pContext->GetFunctionById(params[4]);
     2.9  	if (func == NULL)
    2.10  	{
    2.11  		return pContext	->ThrowNativeError("Invalid function specified");