From 92ee42622542ab5e5c475729bb75e49a0d3b5259 Mon Sep 17 00:00:00 2001
From: Matt Woodrow <pred@alliedmods.net>
Date: Tue, 23 Oct 2007 20:08:19 +0000
Subject: [PATCH] Fixed amb1065 -  Votemap clears itself properly after a
 failed vote

--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401647
---
 plugins/basevotes/votemap.sp | 39 +++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/plugins/basevotes/votemap.sp b/plugins/basevotes/votemap.sp
index 612ed187..a3e8e049 100644
--- a/plugins/basevotes/votemap.sp
+++ b/plugins/basevotes/votemap.sp
@@ -31,6 +31,21 @@ DisplayVoteMapMenu(client, mapCount, String:maps[5][])
 	VoteMenuToAll(g_hVoteMenu, 20);		
 }
 
+ResetMenu()
+{
+	/* Add the removed maps back to the menu */
+	new selectedmaps = GetArraySize(g_SelectedMaps);
+	decl String:mapname[64];
+		
+	for (new i=0; i<selectedmaps; i++)
+	{
+		GetArrayString(g_SelectedMaps, i, mapname, sizeof(mapname))	;
+		AddMenuItem(g_MapList, mapname, mapname);
+	}
+
+	g_VoteMapInUse = false;
+}
+
 ConfirmVote(client)
 {
 	new Handle:menu = CreateMenu(MenuHandler_Confirm);
@@ -54,7 +69,8 @@ public MenuHandler_Confirm(Handle:menu, MenuAction:action, param1, param2)
 	}
 	else if (action == MenuAction_Cancel)
 	{
-		g_VoteMapInUse = false;
+		ResetMenu();
+		
 		if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
 		{
 			DisplayTopMenu(hTopMenu, param1, TopMenuPosition_LastCategory);
@@ -72,25 +88,14 @@ public MenuHandler_Confirm(Handle:menu, MenuAction:action, param1, param2)
 		
 		DisplayVoteMapMenu(param1, selectedmaps, maps);
 		
-		/* Re-enable the menu option */
-		g_VoteMapInUse = false;	
+		ResetMenu();
 	}
 }
 
 public MenuHandler_Map(Handle:menu, MenuAction:action, param1, param2)
 {
 	if (action == MenuAction_Cancel)
-	{
-		/* Add the removed maps back to the menu */
-		new selectedmaps = GetArraySize(g_SelectedMaps);
-		decl String:mapname[64];
-			
-		for (new i=0; i<selectedmaps; i++)
-		{
-			GetArrayString(g_SelectedMaps, i, mapname, sizeof(mapname))	;
-			AddMenuItem(menu, mapname, mapname);
-		}
-		
+	{		
 		if (param2 == MenuCancel_ExitBack && hTopMenu != INVALID_HANDLE)
 		{
 			ConfirmVote(param1);
@@ -98,7 +103,9 @@ public MenuHandler_Map(Handle:menu, MenuAction:action, param1, param2)
 		else // no action was selected.
 		{
 			/* Re-enable the menu option */
-			g_VoteMapInUse = false;	
+			g_VoteMapInUse = false;
+			
+			ResetMenu();
 		}
 	}
 	else if (action == MenuAction_Select)
@@ -139,8 +146,8 @@ public AdminMenu_VoteMap(Handle:topmenu,
 	else if (action == TopMenuAction_SelectOption)
 	{
 		g_VoteMapInUse = true;
-		ClearArray(g_SelectedMaps);
 		g_SelectedCount = 0;
+		ClearArray(g_SelectedMaps);
 		DisplayMenu(g_MapList, param, MENU_TIME_FOREVER);
 	}
 	else if (action == TopMenuAction_DrawOption)