0
@@ -155,7 +155,7 @@ end
0
 ---------------------------------------------------------------------------]]
0
 
0
 local major = "Dongle-1.0"
0
-local minor = tonumber(string.match("$Revision: 612 $", "(%d+)") or 1) + 500
0
+local minor = tonumber(string.match("$Revision: 646 $", "(%d+)") or 1) + 500
0
 -- ** IMPORTANT NOTE **
0
 -- Due to some issues we had previously with Dongle revision numbers
0
 -- we need to artificially inflate the minor revision number, to ensure
0
@@ -884,17 +884,30 @@ function Dongle.SetProfile(db, name)
0
   Dongle:TriggerMessage("DONGLE_PROFILE_CHANGED", db, db.parent, db.sv_name, db.keys.profile)
0
 end
0
 
0
-function Dongle.GetProfiles(db, t)
0
+function Dongle.GetProfiles(db, tbl)
0
   assert(3, databases[db], string.format(L["MUST_CALLFROM_DBOBJECT"], "GetProfiles"))
0
   argcheck(t, 2, "table", "nil")
0
 
0
-	t = t or {}
0
-	local i = 1
0
-	for profileKey in pairs(db.sv.profiles) do
0
-		t[i] = profileKey
0
+	-- Clear the container table
0
+	if tbl then
0
+		for k,v in pairs(tbl) do tbl[k] = nil end
0
+	else
0
+		tbl = {}
0
+	end
0
+
0
+	local i = 0
0
+	for profileKey in pairs(db.profiles) do
0
+		i = i + 1
0
+		tbl[i] = profileKey
0
+	end
0
+
0
+	-- Add the current profile, if it hasn't been created yet
0
+	if rawget(db, "profile") == nil then
0
     i = i + 1
0
+		tbl[i] = db.keys.profile
0
   end
0
-	return t, i - 1
0
+	
0
+	return tbl, i
0
 end
0
 
0
 function Dongle.GetCurrentProfile(db)
0
@@ -966,8 +979,8 @@ end
0
 
0
 function Dongle.RegisterNamespace(db, name, defaults)
0
   assert(3, databases[db], string.format(L["MUST_CALLFROM_DBOBJECT"], "RegisterNamespace"))
0
-		argcheck(name, 2, "string")
0
-	argcheck(defaults, 3, "nil", "string")
0
+	argcheck(name, 2, "string")
0
+	argcheck(defaults, 3, "nil", "table")
0
 
0
   local sv = db.sv
0
   if not sv.namespaces then sv.namespaces = {} end
0
@@ -1147,44 +1160,41 @@ local function PLAYER_LOGOUT(event)
0
   end
0
 end
0
 
0
-local function PLAYER_LOGIN()
0
-	Dongle.initialized = true
0
-	for i=1, #loadorder do
0
-		local obj = loadorder[i]
0
-		if type(obj.Enable) == "function" then
0
-			safecall(obj.Enable, obj)
0
+local PLAYER_LOGIN
0
+do
0
+	local lockPlayerLogin = false
0
+
0
+	function PLAYER_LOGIN()
0
+		if lockPlayerLogin then return end
0
+		
0
+		lockPlayerLogin = true
0
+		
0
+		local obj = table.remove(loadorder, 1)
0
+		while obj do
0
+			if type(obj.Enable) == "function" then
0
+				safecall(obj.Enable, obj)
0
+			end
0
+			obj = table.remove(loadorder, 1)
0
     end
0
-		loadorder[i] = nil
0
+		
0
+		lockPlayerLogin = false
0
   end
0
 end
0
 
0
 local function ADDON_LOADED(event, ...)
0
-	for i=1, #loadqueue do
0
-		local obj = loadqueue[i]
0
+	local obj = table.remove(loadqueue, 1)
0
+	while obj do
0
     table.insert(loadorder, obj)
0
-
0
+		
0
     if type(obj.Initialize) == "function" then
0
       safecall(obj.Initialize, obj)
0
     end
0
-		loadqueue[i] = nil
0
-	end
0
 
0
-	if not Dongle.initialized then
0
-		if type(IsLoggedIn) == "function" then
0
-			Dongle.initialized = IsLoggedIn()
0
-		else
0
-			Dongle.initialized = ChatFrame1.defaultLanguage
0
-		end
0
+		obj = table.remove(loadqueue, 1)
0
   end
0
 
0
-	if Dongle.initialized then
0
-		for i=1, #loadorder do
0
-			local obj = loadorder[i]
0
-			if type(obj.Enable) == "function" then
0
-				safecall(obj.Enable, obj)
0
-			end
0
-			loadorder[i] = nil
0
-		end
0
+	if IsLoggedIn() then
0
+		PLAYER_LOGIN()
0
   end
0
 end
0