Fix NULL _Parent and uninitialized parentId

5 years ago · 71e3ed5868
parent 9d5af13c5e
commit 71e3ed5868
1 changed files with 20 additions and 3 deletions
--- a/code/nel/src/gui/interface_group.cpp
+++ b/code/nel/src/gui/interface_group.cpp
@ -622,13 +622,30 @@ namespace NLGUI
 		{
 			std::string parentId;

-			if( value != "parent" ){
-				if( _Parent != NULL )
+			if (value != "parent")
+			{
+				if (_Parent != NULL)
+				{
 					parentId = _Parent->getId() + ":" + value;
+				}
 				else
+				{
+					parentId = "ui:" + value;
+				}
+			}
+			else
+			{
+				if (_Parent)
+				{
 					parentId = _Parent->getId();
+				}
+				else
+				{
+					parentId = value;
+				}
 			}
-			CWidgetManager::getInstance()->getParser()->addParentSizeMaxAssociation( this, parentId );
+
+			CWidgetManager::getInstance()->getParser()->addParentSizeMaxAssociation(this, parentId);
 			return;
 		}
 		else