mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-30 07:21:12 +00:00
Clean up global setting groups, don't try to destroy setting pages before they were rendered
This commit is contained in:
parent
e88e92d3aa
commit
ef730c4395
@ -386,7 +386,9 @@ local function onGroupRegistered(global, key)
|
||||
|
||||
if not pages[group.page] then return end
|
||||
if pageOptions[group.page] then
|
||||
pageOptions[group.page].element:destroy()
|
||||
if pageOptions[group.page].element then
|
||||
pageOptions[group.page].element:destroy()
|
||||
end
|
||||
else
|
||||
pageOptions[group.page] = {}
|
||||
end
|
||||
@ -423,21 +425,24 @@ local menuPages = {}
|
||||
local function resetPlayerGroups()
|
||||
local playerGroupsSection = storage.playerSection(common.groupSectionKey)
|
||||
for pageKey, page in pairs(groups) do
|
||||
for groupKey, group in pairs(page) do
|
||||
if not menuGroups[groupKey] and not group.global then
|
||||
for groupKey in pairs(page) do
|
||||
if not menuGroups[groupKey] then
|
||||
page[groupKey] = nil
|
||||
playerGroupsSection:set(groupKey, nil)
|
||||
end
|
||||
end
|
||||
if pageOptions[pageKey] then
|
||||
pageOptions[pageKey].element:destroy()
|
||||
local options = pageOptions[pageKey]
|
||||
if options then
|
||||
if options.element then
|
||||
options.element:destroy()
|
||||
end
|
||||
if not menuPages[pageKey] then
|
||||
ui.removeSettingsPage(pageOptions[pageKey])
|
||||
ui.removeSettingsPage(options)
|
||||
pageOptions[pageKey] = nil
|
||||
else
|
||||
local renderedOptions = renderPage(pages[pageKey])
|
||||
for k, v in pairs(renderedOptions) do
|
||||
pageOptions[pageKey][k] = v
|
||||
options[k] = v
|
||||
end
|
||||
end
|
||||
end
|
||||
|
Loading…
x
Reference in New Issue
Block a user