Browse Source

fix bad merge

Lee Thomason 1 week ago
parent
commit
418229dc5c
1 changed files with 1 additions and 2 deletions
  1. 1 2
      tinyxml2.cpp

+ 1 - 2
tinyxml2.cpp

@@ -2348,11 +2348,10 @@ static FILE* callfopen( const char* filepath, const char* mode )
 }
 }
 
 
 void XMLDocument::DeleteNode( XMLNode* node )	{   
 void XMLDocument::DeleteNode( XMLNode* node )	{   
-    TIXMLASSERT( node );
-    TIXMLASSERT(node->_document == this );
     if(node == 0) {
     if(node == 0) {
         return; // check for null pointer
         return; // check for null pointer
     }
     }
+    TIXMLASSERT(node->_document == this);
     if (node->_parent) {
     if (node->_parent) {
         node->_parent->DeleteChild( node );
         node->_parent->DeleteChild( node );
     }
     }