Skip to content

Fix undo resetting active display group #4554

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 12, 2022
Merged

Fix undo resetting active display group #4554

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Classes/SkillsTab.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1168,7 +1168,7 @@ function SkillsTabClass:CreateUndoState()
local state = { }
state.activeSkillSetId = self.activeSkillSetId
state.skillSets = {}
for _, skillSet in ipairs(self.skillSets) do
for skillSetIndex, skillSet in pairs(self.skillSets) do
local newSkillSet = copyTable(skillSet, true)
newSkillSet.socketGroupList = { }
for socketGroupIndex, socketGroup in pairs(skillSet.socketGroupList) do
Expand All @@ -1177,15 +1177,16 @@ function SkillsTabClass:CreateUndoState()
for gemIndex, gem in pairs(socketGroup.gemList) do
newGroup.gemList[gemIndex] = copyTable(gem, true)
end
t_insert(newSkillSet.socketGroupList, newGroup)
newSkillSet.socketGroupList[socketGroupIndex] = newGroup
end
t_insert(state.skillSets, newSkillSet)
state.skillSets[skillSetIndex] = newSkillSet
end
state.skillSetOrderList = copyTable(self.skillSetOrderList)
return state
end

function SkillsTabClass:RestoreUndoState(state)
local displayId = isValueInArray(self.socketGroupList, self.displayGroup)
wipeTable(self.skillSets)
for k, v in pairs(state.skillSets) do
self.skillSets[k] = v
Expand All @@ -1195,7 +1196,6 @@ function SkillsTabClass:RestoreUndoState(state)
self.skillSetOrderList[k] = v
end
self:SetActiveSkillSet(state.activeSkillSetId)
local displayId = isValueInArray(self.socketGroupList, self.displayGroup)
self:SetDisplayGroup(displayId and self.socketGroupList[displayId])
if self.controls.groupList.selValue then
self.controls.groupList.selValue = self.socketGroupList[self.controls.groupList.selIndex]
Expand Down