Milestone 10 final patch

Author: Wishmaster117

Core/MultiBotHandler.lua

@@ -184,11 +184,23 @@ MultiBot.SetSavedMainBarValue = function(key, value)
 	return setSavedMainBarValue(key, value)
 end
 
-local function getLayoutProfileStore()
-	if not (MultiBot.Store and MultiBot.Store.EnsureUIChildStore) then
+local function getLayoutProfileStore(createIfMissing)
+	if not MultiBot.Store then
 		return nil
 	end
-	return MultiBot.Store.EnsureUIChildStore("layout")
+
+	if createIfMissing then
+		if type(MultiBot.Store.EnsureUIChildStore) == "function" then
+			return MultiBot.Store.EnsureUIChildStore("layout")
+		end
+		return nil
+	end
+
+	if type(MultiBot.Store.GetUIChildStore) == "function" then
+		return MultiBot.Store.GetUIChildStore("layout")
+	end
+
+	return nil
 end
 
 local function migrateLegacyLayoutStateIfNeeded(profileStore)
@@ -215,23 +227,31 @@ end
 
 local function getSavedLayoutValue(key)
 	local legacy = getLegacyStateStore(false)
-	local profileStore = getLayoutProfileStore()
+	local profileStore = getLayoutProfileStore(false)
 	if profileStore then
 		migrateLegacyLayoutStateIfNeeded(profileStore)
 	end
 
 	local value = profileStore and profileStore[key] or (legacy and legacy[key])
-	if profileStore and value == nil and MultiBot.ShouldSyncLegacyState(LAYOUT_MIGRATION_KEY, LAYOUT_MIGRATION_VERSION) then
+	if value == nil and MultiBot.ShouldSyncLegacyState(LAYOUT_MIGRATION_KEY, LAYOUT_MIGRATION_VERSION) then
 		value = legacy and legacy[key]
 		if value ~= nil then
-			profileStore[key] = value
+			if not profileStore then
+				profileStore = getLayoutProfileStore(true)
+				if profileStore then
+					migrateLegacyLayoutStateIfNeeded(profileStore)
+				end
+			end
+			if profileStore then
+				profileStore[key] = value
+			end
 		end
 	end
 	return value
 end
 
 local function setSavedLayoutValue(key, value)
-	local profileStore = getLayoutProfileStore()
+	local profileStore = getLayoutProfileStore(true)
 	if profileStore then
 		migrateLegacyLayoutStateIfNeeded(profileStore)
 		profileStore[key] = value

UI/MultiBotAceUI.lua

@@ -85,15 +85,23 @@ function AceUI.RegisterWindowEscapeClose(window, namePrefix)
     table.insert(UISpecialFrames, frameName)
 end
 
-local function getUiProfileStore()
-    if MultiBot.Store and MultiBot.Store.EnsureUIStore then
-        return MultiBot.Store.EnsureUIStore()
+local function getUiProfileStore(createIfMissing)
+    if MultiBot.Store then
+        if createIfMissing and type(MultiBot.Store.EnsureUIStore) == "function" then
+            return MultiBot.Store.EnsureUIStore()
+        end
+        if not createIfMissing and type(MultiBot.Store.GetUIStore) == "function" then
+            return MultiBot.Store.GetUIStore()
+        end
     end
 
     local profile = MultiBot.db and MultiBot.db.profile
     if not profile then
         return nil
     end
+    if not createIfMissing then
+        return type(profile.ui) == "table" and profile.ui or nil
+    end
     profile.ui = profile.ui or {}
     return profile.ui
 end
@@ -103,14 +111,9 @@ function AceUI.BindWindowPosition(window, persistenceKey)
         return
     end
 
-    local uiStore = getUiProfileStore()
-    if not uiStore then
-        return
-    end
-
-    uiStore.popupPositions = uiStore.popupPositions or {}
-    local positions = uiStore.popupPositions
-    local saved = positions[persistenceKey]
+    local uiStore = getUiProfileStore(false)
+    local positions = (uiStore and type(uiStore.popupPositions) == "table") and uiStore.popupPositions or nil
+    local saved = positions and positions[persistenceKey]
     if saved and saved.point then
         window.frame:ClearAllPoints()
         window.frame:SetPoint(saved.point, UIParent, saved.point, saved.x or 0, saved.y or 0)
@@ -124,7 +127,12 @@ function AceUI.BindWindowPosition(window, persistenceKey)
     window.frame:HookScript("OnDragStop", function(frame)
         local point, _, _, x, y = frame:GetPoint(1)
         if point then
-            positions[persistenceKey] = { point = point, x = x or 0, y = y or 0 }
+            local writableUiStore = getUiProfileStore(true)
+            if not writableUiStore then
+                return
+            end
+            writableUiStore.popupPositions = writableUiStore.popupPositions or {}
+            writableUiStore.popupPositions[persistenceKey] = { point = point, x = x or 0, y = y or 0 }
         end
     end)
 end

UI/MultiBotTalentFrame.lua

@@ -61,8 +61,8 @@ local function bindTalentFramePosition(window, persistenceKey)
     end
 
     local positions = nil
-    if MultiBot.Store and MultiBot.Store.EnsureUIChildStore then
-        positions = MultiBot.Store.EnsureUIChildStore("popupPositions")
+    if MultiBot.Store and MultiBot.Store.GetUIChildStore then
+        positions = MultiBot.Store.GetUIChildStore("popupPositions")
     end
 
     if not positions then
@@ -71,12 +71,10 @@ local function bindTalentFramePosition(window, persistenceKey)
             return
         end
 
-        profile.ui = profile.ui or {}
-        profile.ui.popupPositions = profile.ui.popupPositions or {}
-        positions = profile.ui.popupPositions
+        positions = profile.ui and profile.ui.popupPositions
     end
 
-    local saved = positions[persistenceKey]
+    local saved = positions and positions[persistenceKey]
     if saved and saved.point then
         window.frame:ClearAllPoints()
         window.frame:SetPoint(saved.point, UIParent, saved.point, saved.x or 0, saved.y or 0)
@@ -90,7 +88,20 @@ local function bindTalentFramePosition(window, persistenceKey)
     window.frame:HookScript("OnDragStop", function(frame)
         local point, _, _, x, y = frame:GetPoint(1)
         if point then
-            positions[persistenceKey] = { point = point, x = x or 0, y = y or 0 }
+            local writablePositions = nil
+            if MultiBot.Store and MultiBot.Store.EnsureUIChildStore then
+                writablePositions = MultiBot.Store.EnsureUIChildStore("popupPositions")
+            else
+                local profile = MultiBot.db and MultiBot.db.profile
+                if profile then
+                    profile.ui = profile.ui or {}
+                    profile.ui.popupPositions = profile.ui.popupPositions or {}
+                    writablePositions = profile.ui.popupPositions
+                end
+            end
+            if writablePositions then
+                writablePositions[persistenceKey] = { point = point, x = x or 0, y = y or 0 }
+            end
         end
     end)
 end