From b43c8c018b44c91c456d33cd05b34a38a3e0ead8 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Tue, 27 Oct 2009 01:43:51 -0700 Subject: [PATCH] Warn user when adminmenu_custom is going to emit duplicate entries (bug 3894, r=pred). --- plugins/adminmenu/dynamicmenu.sp | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/plugins/adminmenu/dynamicmenu.sp b/plugins/adminmenu/dynamicmenu.sp index 7dae7582..425a250c 100644 --- a/plugins/adminmenu/dynamicmenu.sp +++ b/plugins/adminmenu/dynamicmenu.sp @@ -129,6 +129,9 @@ BuildDynamicMenu() name); } + + decl String:category_name[NAME_LENGTH]; + strcopy(category_name, sizeof(category_name), buffer); if (!KvGotoFirstSubKey(kvMenu)) { @@ -306,14 +309,17 @@ BuildDynamicMenu() decl String:locString[10]; IntToString(location, locString, sizeof(locString)); - AddToTopMenu(hAdminMenu, - buffer, - TopMenuObject_Item, - DynamicMenuItemHandler, - categoryId, - admin, - ADMFLAG_GENERIC, - locString); + if (AddToTopMenu(hAdminMenu, + buffer, + TopMenuObject_Item, + DynamicMenuItemHandler, + categoryId, + admin, + ADMFLAG_GENERIC, + locString) == INVALID_TOPMENUOBJECT) + { + LogError("Duplicate command name \"%s\" in adminmenu_custom.txt category \"%s\"", buffer, category_name); + } } while (KvGotoNextKey(kvMenu));