Merge branch 'master' into InterAfrica

2019-08-18 14:15:27 +02:00
parent 429dae5f50 55168dece2
commit 7f800a43f5
20 changed files with 1417 additions and 1086 deletions
--- a/DataTreeCore.cpp
+++ b/DataTreeCore.cpp
@@ -127,10 +127,8 @@ CDataMember *  CDataMember::CreateChild( const char * Name, const int Len )
 bool  CDataMember::Clear()
 {
    // Clear value
-    if (Value) {
+    if (Value)
        free( Value );
-        Value = NULL;
-    }

    // Clear children
    while (FirstChild) {
@@ -138,7 +136,9 @@ bool  CDataMember::Clear()
    }

    // Reset value
-    Type = jtNull;
+    Type  = jtNull;
+    Value = NULL;
+    Len   = 0;
    return true;
 }
 //---------------------------------------------------------------------------