Skip to content

Commit e68eb90

Browse files
committed
Merge branch 'savetheelements' into 'master'
Detach elements from child before destroying it Closes #8802 See merge request OpenMW/openmw!5036
2 parents cd49012 + b32b98d commit e68eb90

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

components/lua_ui/element.cpp

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,6 @@ namespace LuaUi
4949
MyGUI::Gui::getInstancePtr()->destroyWidget(ext->widget());
5050
}
5151

52-
void destroyChild(WidgetExtension* ext)
53-
{
54-
if (!ext->isRoot())
55-
destroyWidget(ext);
56-
else
57-
ext->detachFromParent();
58-
}
59-
6052
void detachElements(WidgetExtension* ext)
6153
{
6254
auto predicate = [](WidgetExtension* child) {
@@ -69,6 +61,17 @@ namespace LuaUi
6961
ext->detachTemplateChildrenIf(predicate);
7062
}
7163

64+
void destroyChild(WidgetExtension* ext)
65+
{
66+
if (!ext->isRoot())
67+
{
68+
detachElements(ext);
69+
destroyWidget(ext);
70+
}
71+
else
72+
ext->detachFromParent();
73+
}
74+
7275
void destroyRoot(WidgetExtension* ext)
7376
{
7477
detachElements(ext);

0 commit comments

Comments
 (0)