fixed an loadup issue

tdymel · Mar 15, 2017 · 32e2322 · 32e2322
1 parent 9c48101
commit 32e2322
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/DPSMate/DPSMate_DataBuilder.lua b/DPSMate/DPSMate_DataBuilder.lua
@@ -649,6 +649,8 @@ DPSMate.DB.VARIABLES_LOADED = function()
 		DPSMate.Sync:RegisterEvent("UPDATE_MOUSEOVER_UNIT")
 		DPSMate.Sync:SetScript("OnEvent", function() this[event](arg1,arg2,arg3,arg4) end)
 		DPSMate.Sync:SetScript("OnUpdate", function() this:OnUpdate() end)
+		DPSMate.Options:SetScript("OnEvent", function() this[event]() end)
+		DPSMate.Options:SetScript("OnUpdate", function() this:OnUpdate() end)
 
 		DPSMate:SendMessage("DPSMate build "..DPSMate.VERSION.." has been loaded!")
 		this.loaded = true

diff --git a/DPSMate/DPSMate_Options.lua b/DPSMate/DPSMate_Options.lua
@@ -740,17 +740,17 @@ end
 DPSMate.Options.PLAYER_ENTERING_WORLD = function()
 	if DPSMate.DB.loaded then
 		if DPSMateSettings["dataresetsworld"] == 3 then
-			if (GetTime()-LastPopUp) > TimeToNextPopUp and (DPSMate:TableLength(DPSMateUser) ~= 0 or DPSMate:TableLength(DPSMateUserCurrent) ~= 0) then
-				this:ShowResetPopUp()
+			if (GetTime()-LastPopUp) > TimeToNextPopUp then
+				DPSMate.Options:ShowResetPopUp()
 				LastPopUp = GetTime()
 			end
-		elseif DPSMateSettings["dataresetsworld"] == 1 and not this:IsInParty() then
+		elseif DPSMateSettings["dataresetsworld"] == 1 and not DPSMate.Options:IsInParty() then
 			this:PopUpAccept(true)
 		end
-		this:HideInPvP()
+		DPSMate.Options:HideInPvP()
 		if DPSMateSettings["hideonlogin"] then
 			for _, val in pairs(DPSMateSettings["windows"]) do
-				this:Hide(_G("DPSMate_"..val["name"]))
+				DPSMate.Options:Hide(_G("DPSMate_"..val["name"]))
 			end
 		end
 	end
@@ -2199,7 +2199,4 @@ function DPSMate.Options:OnUpdate()
 			reportuptime = 0
 		end
 	end
-end
-
-DPSMate.Options:SetScript("OnEvent", function() this[event]() end)
-DPSMate.Options:SetScript("OnUpdate", this.OnUpdate)
+end