Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
Nimetu 2015-12-22 01:30:11 +02:00
commit bed1d04f6f
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/nel/src/gui/group_html.cpp
View file

@ -1190,7 +1190,12 @@ namespace NLGUI
if (haveParentDiv) if (haveParentDiv)
parentId = getDiv()->getId(); parentId = getDiv()->getId();
else else
{
if (!_Paragraph)
newParagraph (0);
parentId = _Paragraph->getId(); parentId = _Paragraph->getId();
}
CInterfaceGroup *inst = CWidgetManager::getInstance()->getParser()->createGroupInstance(templateName, parentId+":"+id, tmplParams); CInterfaceGroup *inst = CWidgetManager::getInstance()->getParser()->createGroupInstance(templateName, parentId+":"+id, tmplParams);
if (inst) if (inst)
@ -1210,12 +1215,6 @@ namespace NLGUI
} }
else else
{ {
if (!_Paragraph)
{
newParagraph (0);
paragraphChange ();
}
getParagraph()->addChild(inst); getParagraph()->addChild(inst);
paragraphChange(); paragraphChange();
} }