From 66cd90e4af3c02618408cc84559d2bdb9c9889e3 Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Mon, 16 Jul 2012 13:58:41 +0100
Subject: [PATCH] Added some assertions to ValueTree

---
 modules/juce_data_structures/values/juce_ValueTree.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/juce_data_structures/values/juce_ValueTree.cpp b/modules/juce_data_structures/values/juce_ValueTree.cpp
index 872563006d..98041aee4d 100644
--- a/modules/juce_data_structures/values/juce_ValueTree.cpp
+++ b/modules/juce_data_structures/values/juce_ValueTree.cpp
@@ -757,7 +757,8 @@ var ValueTree::getProperty (const Identifier& name, const var& defaultReturnValu
 ValueTree& ValueTree::setProperty (const Identifier& name, const var& newValue,
                                    UndoManager* const undoManager)
 {
-    jassert (name.toString().isNotEmpty());
+    jassert (name.toString().isNotEmpty()); // Must have a valid property name!
+    jassert (object != nullptr); // Trying to add a property to a null ValueTree will fail!
 
     if (object != nullptr)
         object->setProperty (name, newValue, undoManager);
@@ -795,6 +796,8 @@ Identifier ValueTree::getPropertyName (const int index) const
 
 void ValueTree::copyPropertiesFrom (const ValueTree& source, UndoManager* const undoManager)
 {
+    jassert (object != nullptr || source.object == nullptr); // Trying to add properties to a null ValueTree will fail!
+
     if (source.object == nullptr)
         removeAllProperties (undoManager);
     else if (object != nullptr)
@@ -885,6 +888,8 @@ int ValueTree::indexOf (const ValueTree& child) const
 
 void ValueTree::addChild (const ValueTree& child, int index, UndoManager* const undoManager)
 {
+    jassert (object != nullptr); // Trying to add a child to a null ValueTree!
+
     if (object != nullptr)
         object->addChild (child.object, index, undoManager);
 }