From b2c71785dffc0774d17a8f5ea01ea0107992a5a0 Mon Sep 17 00:00:00 2001
From: F16Gaming <adam.hellberg95@gmail.com>
Date: Sun, 13 Nov 2011 19:50:59 +0100
Subject: [PATCH] Bug fixes.

FIXED: Should no longer cause entries to be deleted when the Delete dialog is cancelled with ESC or timeout.
FIXED: Should now properly wait for "Load more entries" after every hundreth loaded entry.
---
 Dialogs.lua |    6 +++---
 MobList.lua |   38 ++++++++++++++++----------------------
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/Dialogs.lua b/Dialogs.lua
index 695a333..2f8d110 100644
--- a/Dialogs.lua
+++ b/Dialogs.lua
@@ -31,10 +31,10 @@ StaticPopupDialogs["KILLTRACK_FINISH"] = {
 StaticPopupDialogs["KILLTRACK_DELETE"] = {
 	text = "Delete %s with ID %s?",
 	button1 = "Delete all",
-	button2 = "Character only",
-	button3 = "Cancel",
+	button2 = "CANCEL",
+	button3 = "Character Only",
 	OnAccept = function() KT:Delete(KT.Temp.DeleteId) end,
-	OnCancel = function() KT:Delete(KT.Temp.DeleteId, true) end, -- Cancel is actually the second (button2) button.
+	OnAlt = function() KT:Delete(KT.Temp.DeleteId, true) end,
 	showAlert = true,
 	timeout = 10,
 	whileDead = true,
diff --git a/MobList.lua b/MobList.lua
index 766f48e..ec9d800 100644
--- a/MobList.lua
+++ b/MobList.lua
@@ -35,13 +35,13 @@ local frame, scrollHeader, idHeader, nameHeader, cKillsHeader, gKillsHeader, scr
 local loadFrame = CreateFrame("Frame")
 
 local index = 0
-local count = 0
+local count = 1
 
 local function update(_, elapsed)
 	index = index + 1
 	ML:AddItem(index)
 	local c = floor((index)/100)
-	if c > count and index < MAX_LOAD_INDEX then
+	if c == count and index ~= MAX_LOAD_INDEX then
 		count = count + 1
 		--w = c/10
 		loadButton:SetDisabled(false)
@@ -52,7 +52,7 @@ local function update(_, elapsed)
 		loadFrame:SetScript("OnUpdate", nil)
 	elseif index >= #KT.Temp.MobEntries then
 		index = 0
-		count = 0
+		count = 1
 		ML.LoadWarning = false
 		frame:SetStatusText(("%d/%d mob entries loaded."):format(#KT.Temp.MobEntries, #KT.Temp.MobEntries))
 		loadButton:SetDisabled(true)
@@ -65,8 +65,8 @@ StaticPopupDialogs["KILLTRACK_LOADWARNING"] = {
 	button1 = "Continue",
 	button2 = "Purge",
 	button3 = "Cancel",
-	OnAccept = function() loadFrame:SetScript("OnUpdate", update) end,
-	OnCancel = function() index = 0 count = 0 ML.LoadWarning = false ML:HideGUI() KT:ShowPurge() end, -- This is actually button2, not 3
+	OnAccept = function() count = count + 1 loadFrame:SetScript("OnUpdate", update) end,
+	OnCancel = function() index = 0 count = 1 ML.LoadWarning = false ML:HideGUI() KT:ShowPurge() end, -- This is actually button2, not 3
 	OnAlt = function() index = 0 end,
 	showAlert = true,
 	timeout = 0,
@@ -75,11 +75,18 @@ StaticPopupDialogs["KILLTRACK_LOADWARNING"] = {
 }
 
 function ML:ShowGUI()
+	index = 0
+	count = 1
+
 	frame = GUI:Create("Frame")
 	frame:SetHeight(600)
 	frame:SetWidth(560)
 	frame:SetLayout("Flow")
 	frame:SetTitle("KillTrack - Mob List")
+	frame:SetCallback("OnRelease", function(frame)
+		index = 0
+		count = 1
+	end)
 	frame:SetCallback("OnClose", function(frame) frame:Release() end)
 
 	local loadHeader = GUI:Create("SimpleGroup")
@@ -108,7 +115,7 @@ function ML:ShowGUI()
 	idHeader:SetCallback("OnClick", function()
 		loadButton:SetDisabled(true)
 		index = 0
-		count = 0
+		count = 1
 		ML.LoadWarning = false
 		if Sort == KT.Sort.IdAsc then
 			Sort = KT.Sort.IdDesc
@@ -126,7 +133,7 @@ function ML:ShowGUI()
 	nameHeader:SetCallback("OnClick", function()
 		loadButton:SetDisabled(true)
 		index = 0
-		count = 0
+		count = 1
 		ML.LoadWarning = false
 		if Sort == KT.Sort.AlphaA then
 			Sort = KT.Sort.AlphaD
@@ -144,7 +151,7 @@ function ML:ShowGUI()
 	cKillsHeader:SetCallback("OnClick", function()
 		loadButton:SetDisabled(true)
 		index = 0
-		count = 0
+		count = 1
 		ML.LoadWarning = false
 		if Sort == KT.Sort.CharDesc then
 			Sort = KT.Sort.CharAsc
@@ -162,7 +169,7 @@ function ML:ShowGUI()
 	gKillsHeader:SetCallback("OnClick", function()
 		loadButton:SetDisabled(true)
 		index = 0
-		count = 0
+		count = 1
 		ML.LoadWarning = false
 		if Sort == KT.Sort.Desc then
 			Sort = KT.Sort.Asc
@@ -266,19 +273,6 @@ function ML:UpdateList()
 	loadFrame:SetScript("OnUpdate", update)
 
 	--[[
-	local co = coroutine.create(AddItems)
-
-	while coroutine.status(co) ~= "dead" do
-		local errorfree, count, container = coroutine.resume(co)
-		if errorfree then
-			scroll:AddChild(container)
-
-		else
-			message("Unknown error encountered while loading mob list.")
-			error("Unknown error encountered while loading mob list.")
-		end
-	end
-
 	local entries = KT:GetSortedMobTable(Sort)
 
 	for i,v in ipairs(entries) do
-- 
1.7.9.5