Quantcast

Signed-off-by: Alar of Daggerspine <alar@aspide.it>

Alar of Daggerspine [02-26-15 - 12:10]
Signed-off-by: Alar of Daggerspine <alar@aspide.it>
Filename
GarrisonCommander.lua
MissionCompletion.lua
MissionControl.lua
diff --git a/GarrisonCommander.lua b/GarrisonCommander.lua
index e3c7bd3..96bdd5c 100644
--- a/GarrisonCommander.lua
+++ b/GarrisonCommander.lua
@@ -2770,7 +2770,7 @@ do
 			local tick=math.floor(GetTime()*10)
 			if (tick == lastcall) then
 			else
-				collectgarbage("step",100)
+				collectgarbage("step",500)
 				lastcall=tick
 				return
 			end
@@ -2816,6 +2816,9 @@ function over.GarrisonMissionPageFollowerFrame_OnEnter(self)
 	if not self.info then
 		return;
 	end
+	if ns.missionautocompleting then
+		return
+	end
 	GarrisonFollowerTooltip:ClearAllPoints();
 	GarrisonFollowerTooltip:SetPoint("TOPLEFT", self, "BOTTOMRIGHT");
 	GarrisonFollowerTooltip_Show(self.info.garrFollowerID,
@@ -2843,6 +2846,7 @@ function over.GarrisonMissionButton_OnEnter(self, button)
 	if (self.info == nil) then
 		return;
 	end
+	collectgarbage("step",100)

 	GameTooltip:SetOwner(self, "ANCHOR_CURSOR_RIGHT");

diff --git a/MissionCompletion.lua b/MissionCompletion.lua
index aa43e45..144cc57 100644
--- a/MissionCompletion.lua
+++ b/MissionCompletion.lua
@@ -28,7 +28,7 @@ function addon:GenerateMissionCompleteList(title)
 			end
 			function m:ScrollDown()
 				local obj=self.scroll
-				if (#self.missions >6 and obj.scrollbar and obj.scrollbar:IsShown()) then
+				if (#self.missions >1 and obj.scrollbar and obj.scrollbar:IsShown()) then
 					obj:SetScroll(80)
 					obj.scrollbar.ScrollDownButton:Click()
 				end
@@ -36,6 +36,10 @@ function addon:GenerateMissionCompleteList(title)
 			function m:OnAcquire()
 				wipe(self.missions)
 			end
+			function m:OnClose()
+				print("azzero completing")
+				ns.missionautocompleting=nil
+			end
 			function m:Show()
 				self.frame:Show()
 			end
@@ -143,6 +147,7 @@ function addon:GenerateMissionCompleteList(title)
 	end
 	local w=AceGUI:Create("GCMCList")
 	w:SetTitle(title)
+	w:SetCallback("OnClose", function() ns.missionautocompleting=nil end)
 	return w
 end

@@ -179,7 +184,7 @@ do
 		GarrisonMissionList_UpdateMissions()
 		-- Re-enable "view" button
 		GMFMissions.CompleteDialog.BorderFrame.ViewButton:SetEnabled(true)
-		missionautocompleting=nil
+		ns.missionautocompleting=nil
 		GarrisonMissionFrame_SelectTab(1)
 		GarrisonMissionFrame_CheckCompleteMissions()
 	end
diff --git a/MissionControl.lua b/MissionControl.lua
index 6c04213..ed86884 100644
--- a/MissionControl.lua
+++ b/MissionControl.lua
@@ -142,7 +142,7 @@ do
 				wipe(aMissions)
 				currentMission=0
 				x=0
-				timeElapsed=0.2
+				timeElapsed=0.5
 			else
 				local missionID=aMissions[currentMission]
 				GMC.ml.widget:SetFormattedTitle("Processing mission %d of %d (%s)",currentMission,#aMissions,G.GetMissionName(missionID))