#123 Fix some thing (crash on null handler)

skylicht-lab · May 13, 2022 · af7c2d2 · af7c2d2
1 parent d23fe77
commit af7c2d2
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/Projects/Editor/Source/Editor/SpaceController/CSceneController.cpp b/Projects/Editor/Source/Editor/SpaceController/CSceneController.cpp
@@ -909,15 +909,17 @@ namespace Skylicht
 					{
 						// delete entity
 						CEntityHandleData* data = entity->getData<CEntityHandleData>();
+						if (data != NULL)
+						{
+							CEntityHandler* handler = data->Handler;
+							handler->removeEntity(entity);
 
-						CEntityHandler* handler = data->Handler;
-						handler->removeEntity(entity);
-
-						// remove gui hierachy
-						if (m_spaceHierarchy != NULL)
-							m_spaceHierarchy->getController()->updateTreeNode(handler->getGameObject());
+							// remove gui hierachy
+							if (m_spaceHierarchy != NULL)
+								m_spaceHierarchy->getController()->updateTreeNode(handler->getGameObject());
 
-						modifyGameObjects.push_back(handler->getGameObject());
+							modifyGameObjects.push_back(handler->getGameObject());
+						}
 					}
 				}
 			}