From 03c0b121e79bea0459aa80bd023906ac3fe2836f Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 30 Oct 2018 22:04:06 +0100 Subject: [PATCH] [DEBUG] correct treeNode removing --- etk/TreeNode.hpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/etk/TreeNode.hpp b/etk/TreeNode.hpp index f4b7734..1402cb2 100644 --- a/etk/TreeNode.hpp +++ b/etk/TreeNode.hpp @@ -35,7 +35,8 @@ namespace etk { if (_parent == m_parent.lock()) { return; } - if (m_parent != null) { + if ( m_parent != null + && _parent != null) { ETK_THROW_EXCEPTION(etk::exception::RuntimeError("Set a treeNode parrent on an already used treeNode")); } m_parent = _parent; @@ -80,7 +81,7 @@ namespace etk { auto it = m_childs.begin(); while (it != m_childs.end()) { if (*it == _child) { - it->setParent(null); + (*it)->setParent(null); m_childs.erase(it); return; }